From 0f457a3f8d187cfdd0b3b039e294800719d09901 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Jul 2016 15:07:11 +0200 Subject: Depsgraph: Fix shape key nodes trying to be added multiple times --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 74a5be997f1..2d67ef1d584 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 */ -- cgit v1.2.3