Commit: 0f457a3f8d187cfdd0b3b039e294800719d09901
Author: Sergey Sharybin
Date: Mon Jul 11 15:07:11 2016 +0200
Branches: master
https://developer.blender.org/rB0f457a3f8d187cfdd0b3b039e294800719d09901
Depsgraph: Fix shape key nodes trying to be added multiple times
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 74a5be9..2d67ef1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -985,11 +985,6 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene,
Object *ob)
// TODO: "Done" operation
- /* ShapeKeys */
- Key *key = BKE_key_from_object(ob);
- if (key)
- build_shapekeys(key);
-
/* Modifiers */
if (ob->modifiers.first) {
ModifierData *md;
@@ -1025,6 +1020,12 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene
*scene, Object *ob)
return;
}
+ /* ShapeKeys */
+ Key *key = BKE_key_from_object(ob);
+ if (key) {
+ build_shapekeys(key);
+ }
+
build_animdata(obdata);
/* nodes for result of obdata's evaluation, and geometry evaluation on
object */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
