archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Walk into dupli_group object

Browse Source 
That will help with cases when dupli_group object is not linked
directly to the scene.
This commit is contained in:
Sergey Sharybin
2018-06-21 15:41:51 +02:00
parent b80cce2053
commit ad42c358f8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,6 +541,9 @@ void DepsgraphNodeBuilder::build_object(int base_index,
if (object->proxy_from) { if (object->proxy_from) {
build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY); build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY);
} }
if (object->proxy_group) {
build_object(-1, object->proxy_group, DEG_ID_LINKED_INDIRECTLY);
}
/* Object dupligroup. */ /* Object dupligroup. */
if (object->dup_group != NULL) { if (object->dup_group != NULL) {
build_collection(DEG_COLLECTION_OWNER_OBJECT, object->dup_group); build_collection(DEG_COLLECTION_OWNER_OBJECT, object->dup_group);

4
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@@ -596,7 +596,9 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
ComponentKey proxy_transform_key(&object->id, DEG_NODE_TYPE_TRANSFORM); ComponentKey proxy_transform_key(&object->id, DEG_NODE_TYPE_TRANSFORM);
add_relation(ob_transform_key, proxy_transform_key, "Proxy Transform"); add_relation(ob_transform_key, proxy_transform_key, "Proxy Transform");
} }
if (object->proxy_group) {
build_object(NULL, object->proxy_group);
}
/* Object dupligroup. */ /* Object dupligroup. */
if (object->dup_group != NULL) { if (object->dup_group != NULL) {
build_collection(DEG_COLLECTION_OWNER_OBJECT, object, object->dup_group); build_collection(DEG_COLLECTION_OWNER_OBJECT, object, object->dup_group);