[Bf-blender-cvs] [55f8759] master: Depsgraph: Fix compilation error with legacy depsgraph disabled

Sergey Sharybin noreply at git.blender.org
Tue Sep 1 11:48:33 CEST 2015


Commit: 55f87590f09d6ab960d4f64d8d7c0503bc5b6b06
Author: Sergey Sharybin
Date:   Tue Sep 1 14:47:39 2015 +0500
Branches: master
https://developer.blender.org/rB55f87590f09d6ab960d4f64d8d7c0503bc5b6b06

Depsgraph: Fix compilation error with legacy depsgraph disabled

Reported by Campbell on IRC, partial patch by him as well.

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

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

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

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 0d74c35..82ec960 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -3504,9 +3504,15 @@ void DAG_exit(void)
 /* ************************ API *********************** */
 
 void DAG_editors_update_cb(DEG_EditorUpdateIDCb id_func,
-                           DEG_EditorUpdateSceneCb scene_func)
+                           DEG_EditorUpdateSceneCb scene_func,
+                           DEG_EditorUpdateScenePreCb scene_func_pre)
 {
-	DEG_editors_set_update_cb(id_func, scene_func);
+	DEG_editors_set_update_cb(id_func, scene_func, scene_func_pre);
+}
+
+void DAG_editors_update_pre(Main *bmain, Scene *scene, bool time)
+{
+	DEG_editors_update_pre(bmain, scene, time);
 }
 
 /* Tag all relations for update. */




More information about the Bf-blender-cvs mailing list