Commit: 187cafed41d972a1c63e6e5bfe5ab18137e009af
Author: Sergey Sharybin
Date: Tue Dec 30 18:19:48 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB187cafed41d972a1c63e6e5bfe5ab18137e009af
Depsgraph: Correction to previous commits to avoid asserts when built with
legacy depsgraph
===================================================================
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/SConscript
===================================================================
diff --git a/source/blender/depsgraph/CMakeLists.txt
b/source/blender/depsgraph/CMakeLists.txt
index a9d8774..0c4164b7 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -102,4 +102,8 @@ else()
endif()
endif()
+if(WITH_LEGACY_DEPSGRAPH)
+ add_definitions(-DWITH_LEGACY_DEPSGRAPH)
+endif()
+
blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/depsgraph/SConscript
b/source/blender/depsgraph/SConscript
index 3a03533..904d54e 100644
--- a/source/blender/depsgraph/SConscript
+++ b/source/blender/depsgraph/SConscript
@@ -64,6 +64,9 @@ else:
print("-- Replacing unordered_map/set with map/set (warning: slower!)")
defs.append('DEG_NO_UNORDERED_MAP')
+if env['WITH_BF_LEGACY_DEPSGRAPH']:
+ defs.append('WITH_LEGACY_DEPSGRAPH')
+
env.BlenderLib(libname='bf_depsgraph', sources=sources,
includes=incs, defines=defs,
libtype=['core', 'player'], priority=[200, 40])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
