[Bf-blender-cvs] [52bad89] depsgraph_refactor: Depsgraph: Make source closer to master
Sergey Sharybin
noreply at git.blender.org
Mon May 11 17:30:28 CEST 2015
Commit: 52bad89fc418d11ece8952d674f07faab0ccf0a7
Author: Sergey Sharybin
Date: Mon May 11 20:26:57 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB52bad89fc418d11ece8952d674f07faab0ccf0a7
Depsgraph: Make source closer to master
There were some unwanted changes, probably caused by not really correct
merge conflict resolving.
And also reverted whole bunch of changes related on global enabling of
C++11 with MINGW. We don't use C++11 by default now, so Blender should
still be compilable.
===================================================================
M intern/audaspace/Python/AUD_PyAPI.cpp
M intern/audaspace/intern/AUD_C-API.cpp
M intern/cycles/blender/blender_python.cpp
M intern/cycles/util/util_types.h
M intern/ghost/intern/GHOST_WindowWin32.cpp
M intern/smoke/intern/WAVELET_NOISE.h
M source/blender/blenlib/BLI_math_base.h
M source/blender/blenlib/intern/math_base.c
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/python/BPy_BBox.h
M source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
M source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
M source/blender/freestyle/intern/python/BPy_ContextFunctions.h
M source/blender/freestyle/intern/python/BPy_Convert.h
M source/blender/freestyle/intern/python/BPy_Freestyle.h
M source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
M source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
M source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
M source/blender/freestyle/intern/python/BPy_ViewMap.h
M source/blender/freestyle/intern/python/BPy_ViewShape.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
M source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp
index 072cf1c..dc019c1 100644
--- a/intern/audaspace/Python/AUD_PyAPI.cpp
+++ b/intern/audaspace/Python/AUD_PyAPI.cpp
@@ -26,7 +26,6 @@
* \ingroup audpython
*/
-#include <cmath>
#include "AUD_PyAPI.h"
#include <structmember.h>
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 6329949..78b9279 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -36,6 +36,10 @@
// pass
#endif
+#ifdef WITH_PYTHON
+# include "AUD_PyInit.h"
+# include "AUD_PyAPI.h"
+#endif
#include <set>
#include <cstdlib>
@@ -44,11 +48,6 @@
#include <sstream>
#include <iostream>
-#ifdef WITH_PYTHON
-# include "AUD_PyInit.h"
-# include "AUD_PyAPI.h"
-#endif
-
#include "AUD_NULLDevice.h"
#include "AUD_I3DDevice.h"
#include "AUD_I3DHandle.h"
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 0a2f883..200003f 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <cmath>
#include <Python.h>
#include "CCL_api.h"
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 0c4c1f1..187675e 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -500,7 +500,7 @@ template<typename T> static inline T decltype_helper(T x) { return x; }
* ... the compiler optimizes away the temp var */
#ifdef __GNUC__
#define CHECK_TYPE(var, type) { \
- TYPEOF(var) *__tmp; \
+ TYPEOF(var) *__tmp; \
__tmp = (type *)NULL; \
(void)__tmp; \
} (void)0
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index b1e177d..efcb389 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -49,10 +49,6 @@
#include <string.h>
#include <assert.h>
-/* XXX: mingw64 c++11 compile fix */
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
const wchar_t *GHOST_WindowWin32::s_windowClassName = L"GHOST_WindowClass";
diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h
index 771e045..9f01c8a 100644
--- a/intern/smoke/intern/WAVELET_NOISE.h
+++ b/intern/smoke/intern/WAVELET_NOISE.h
@@ -49,9 +49,7 @@
#ifdef WIN32
#include <float.h>
-#ifndef __MINGW64__
-# define isnan _isnan
-#endif
+#define isnan _isnan
#endif
// Tile file header, update revision upon any change done to the noise generator
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index 64fdd03..79a2d57 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -149,18 +149,6 @@ static const int NAN_INT = 0x7FC00000;
#ifdef WIN32
# if defined(_MSC_VER)
# define finite(n) _finite(n)
-# elif defined(__MINGW64__)
- /* finite(x) is not defined for mingw64 using C++11,
- * so we have to use std::isfinite(x) instead.
- *
- * But, remapping all finite(x) calls to std::isfinite(x)
- * is not so easy, as these headers are used in both C and C++ code.
- */
- int __finite(double n);
-
-# ifdef __cplusplus
-# define finite(n) __finite(n)
-# endif
# endif
#endif
diff --git a/source/blender/blenlib/intern/math_base.c b/source/blender/blenlib/intern/math_base.c
index 59e0e5e..0a1e9e8 100644
--- a/source/blender/blenlib/intern/math_base.c
+++ b/source/blender/blenlib/intern/math_base.c
@@ -78,14 +78,3 @@ double double_round(double x, int ndigits)
/* if computation resulted in overflow, raise OverflowError */
return z;
}
-
-/* Hack for problems with mingw64, C++11, and finite(x) not existing */
-#if defined(WIN32) && defined(__MINGW64__)
-int __finite(double x)
-{
- /* just a wrapper around the version that's available in C,
- * so that we have something our macro redef can expose to C++ code
- */
- return finite(x);
-}
-#endif
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 68b96cb..5cd2e16 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -23,7 +23,6 @@
*/
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 89999ba..089c216 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_BBOX_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index 3a67977..a9a2297 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 4dfa40b..43511ed 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
index 728afba..4065277 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index e601176..35c1e58 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_CONVERT_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index d057dd7..0ed2e00 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -27,7 +27,6 @@
#ifdef __cplusplus
extern "C" {
-#include <math.h>
#endif
#include <Python.h>
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 751e49e..58126d5 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 5458e14..0b38b3d 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index 562ee50..bbbec57 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
index 5c9311d..cd42e94 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_VIEWMAP_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
index 145fcaa..09bf36e 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -26,7 +26,6 @@
#define __FREESTYLE_PYTHON_VIEWSHAPE_H__
extern "C" {
-#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
index 16b419e..c4fead6 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
@@ -29,7 +29,6 @@
#ifdef __cplusplus
extern "C" {
-#include <math.h>
#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
index 54540e1..038d002 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
@@ -29,7 +29,6 @@
#ifdef __cplusplus
extern "C" {
-#include <math.h>
#endif
///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
index ecd35b6..1d67a8c 100644
--- a/source/blender/ren
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list