[Bf-blender-cvs] [ec3165e] depsgraph_refactor: Depsgraph: Fix crash when built with legacy depsgraph and transforming the object
Sergey Sharybin
noreply at git.blender.org
Wed Jan 7 16:38:01 CET 2015
Commit: ec3165edc68f48c9813e7520e0a1e89e35f5bd0e
Author: Sergey Sharybin
Date: Wed Jan 7 20:36:17 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBec3165edc68f48c9813e7520e0a1e89e35f5bd0e
Depsgraph: Fix crash when built with legacy depsgraph and transforming the object
Simply forgot to add return into a function which shouldn't be used with new dependency graph.
===================================================================
M source/blender/blenkernel/intern/depsgraph.c
===================================================================
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 4a4987e..798de3d 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1933,7 +1933,11 @@ void DAG_scene_flush_update(Main *bmain, Scene *sce, unsigned int lay, const sho
DagAdjList *itA;
Object *ob;
int lasttime;
-
+
+ if (!DEG_depsgraph_use_legacy()) {
+ return;
+ }
+
if (sce->theDag == NULL) {
printf("DAG zero... not allowed to happen!\n");
DAG_scene_relations_update(bmain, sce);
More information about the Bf-blender-cvs
mailing list