diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-06-01 17:24:59 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-06-01 17:24:59 +0300 |
| commit | a12ab5b2ef49ccacae091ccb54d72de0d63f990d (patch) | |
| tree | c0e27dc580fca576dc7e3fc0ee21db2559d0f80c /source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | |
| parent | e9e8f105d0311e61f99d8a8777ed77d38b49fe46 (diff) | |
| parent | 44a8070db3c03a4e12d1ec1ca15432ec2b36e2fc (diff) | |
Merge branch 'blender2.8' into tmp-b28-motionpath-drawingtmp-b28-motionpath-drawing
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 677dcfbfb8d..5867e278c78 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -502,10 +502,9 @@ void DepsgraphNodeBuilder::build_object(int base_index, if (object->gpd != NULL) { build_gpencil(object->gpd); } - /* Object that this is a proxy for. */ - if (object->proxy) { - object->proxy->proxy_from = object; - build_object(-1, object->proxy, DEG_ID_LINKED_INDIRECTLY); + /* Proxy object to copy from. */ + if (object->proxy_from) { + build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY); } /* Object dupligroup. */ if (object->dup_group != NULL) { |