Blender Git Loki
Git Commits -> Revision 52bad89
Revision 52bad89 by Sergey Sharybin (depsgraph_refactor) May 11, 2015, 15:29 (GMT) |
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. |
Commit Details:
Full Hash: 52bad89fc418d11ece8952d674f07faab0ccf0a7
Parent Commit: 52950f8
Lines Changed: +7, -64
24 Modified Paths:
/intern/audaspace/intern/AUD_C-API.cpp (+4, -5) (Diff)
/intern/audaspace/Python/AUD_PyAPI.cpp (+0, -1) (Diff)
/intern/cycles/blender/blender_python.cpp (+0, -1) (Diff)
/intern/cycles/util/util_types.h (+1, -1) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+0, -4) (Diff)
/intern/smoke/intern/WAVELET_NOISE.h (+1, -3) (Diff)
/source/blender/blenlib/BLI_math_base.h (+0, -12) (Diff)
/source/blender/blenlib/intern/math_base.c (+0, -11) (Diff)
/source/blender/freestyle/intern/application/Controller.cpp (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BBox.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ContextFunctions.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_Convert.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_Freestyle.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewMap.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewShape.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h (+0, -1) (Diff)
/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp (+0, -11) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+1, -1) (Diff)
/intern/audaspace/Python/AUD_PyAPI.cpp (+0, -1) (Diff)
/intern/cycles/blender/blender_python.cpp (+0, -1) (Diff)
/intern/cycles/util/util_types.h (+1, -1) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+0, -4) (Diff)
/intern/smoke/intern/WAVELET_NOISE.h (+1, -3) (Diff)
/source/blender/blenlib/BLI_math_base.h (+0, -12) (Diff)
/source/blender/blenlib/intern/math_base.c (+0, -11) (Diff)
/source/blender/freestyle/intern/application/Controller.cpp (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BBox.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ContextFunctions.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_Convert.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_Freestyle.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewMap.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewShape.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h (+0, -1) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h (+0, -1) (Diff)
/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp (+0, -11) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021