Merge branch 'master' into blender2.8

[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations.cc

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 6564292e7f4a7e883e7706b32cb12075fb70561b..ced53bdf2e4a4b73db673f0c7dda18d55170f840 100644 (file)
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -264,6 +264,13 @@ void DepsgraphRelationBuilder::build_scene(Main *bmain, Scene *scene)
        for (Base *base = (Base *)scene->base.first; base; base = base->next) {
                Object *ob = base->object;
 
        for (Base *base = (Base *)scene->base.first; base; base = base->next) {
                Object *ob = base->object;
 

+               /* Object that this is a proxy for.
+                * Just makes sure backlink is correct.
+                */
+               if (ob->proxy) {
+                       ob->proxy->proxy_from = ob;
+               }
+

                /* object itself */
                build_object(bmain, scene, ob);
 
                /* object itself */
                build_object(bmain, scene, ob);
 


@@ -431,7 +438,6 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o
                                break;
                        }
 
                                break;
                        }
 

-

                        case OB_ARMATURE: /* Pose */
                                if (ob->id.lib != NULL && ob->proxy_from != NULL) {
                                        build_proxy_rig(ob);
                        case OB_ARMATURE: /* Pose */
                                if (ob->id.lib != NULL && ob->proxy_from != NULL) {
                                        build_proxy_rig(ob);