[Bf-blender-cvs] [4c1efcc] master: Code cleanup, silence some warnings when building without legacy depsgraph

Sergey Sharybin noreply at git.blender.org
Wed May 27 10:11:05 CEST 2015


Commit: 4c1efcc829046dc8fc3e2daba0ad3e138a168b1b
Author: Sergey Sharybin
Date:   Wed May 27 13:10:26 2015 +0500
Branches: master
https://developer.blender.org/rB4c1efcc829046dc8fc3e2daba0ad3e138a168b1b

Code cleanup, silence some warnings when building without legacy depsgraph

===================================================================

M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7124715..bd03706 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1303,6 +1303,7 @@ static void scene_armature_depsgraph_workaround(Main *bmain)
 }
 #endif
 
+#ifdef WITH_LEGACY_DEPSGRAPH
 static void scene_rebuild_rbw_recursive(Scene *scene, float ctime)
 {
 	if (scene->set)
@@ -1320,6 +1321,7 @@ static void scene_do_rb_simulation_recursive(Scene *scene, float ctime)
 	if (BKE_scene_check_rigidbody_active(scene))
 		BKE_rigidbody_do_simulation(scene, ctime);
 }
+#endif
 
 /* Used to visualize CPU threads activity during threaded object update,
  * would pollute STDERR with whole bunch of timing information which then




More information about the Bf-blender-cvs mailing list