blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Depsgraph: Fix shape key nodes trying to be added multiple times

This commit is contained in:
Sergey Sharybin 2016-07-11 15:07:11 +02:00
parent 96dd4cdb9e
commit 0f457a3f8d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -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 */