DNA: rename dup_* struct members to instance_*

2 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index f29c221beeb..a8f8ce812a2 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -622,11 +622,11 @@ void DepsgraphNodeBuilder::build_object(int base_index,
 		        -1, object->proxy_group, DEG_ID_LINKED_INDIRECTLY, is_visible);
 	}
 	/* Object dupligroup. */
-	if (object->dup_group != NULL) {
+	if (object->instance_collection != NULL) {
 		const bool is_current_parent_collection_visible =
 		        is_parent_collection_visible_;
 		is_parent_collection_visible_ = is_visible;
-		build_collection(NULL, object->dup_group);
+		build_collection(NULL, object->instance_collection);
 		is_parent_collection_visible_ = is_current_parent_collection_visible;
 		add_operation_node(
 		        &object->id, NodeType::DUPLI, OperationCode::DUPLI);
@@ -1123,16 +1123,16 @@ void DepsgraphNodeBuilder::build_particle_systems(Object *object,
 		/* Visualization of particle system. */
 		switch (part->ren_as) {
 			case PART_DRAW_OB:
-				if (part->dup_ob != NULL) {
+				if (part->instance_object != NULL) {
 					build_object(-1,
-					             part->dup_ob,
+					             part->instance_object,
 					             DEG_ID_LINKED_INDIRECTLY,
 					             is_object_visible);
 				}
 				break;
 			case PART_DRAW_GR:
-				if (part->dup_group != NULL) {
-					build_collection(NULL, part->dup_group);
+				if (part->instance_collection != NULL) {
+					build_collection(NULL, part->instance_collection);
 				}
 				break;
 		}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 3ef8151f4c3..503fee16280 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -697,8 +697,8 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
 		             "Proxy Group Transform");
 	}
 	/* Object dupligroup. */
-	if (object->dup_group != NULL) {
-		build_collection(NULL, object, object->dup_group);
+	if (object->instance_collection != NULL) {
+		build_collection(NULL, object, object->instance_collection);
 	}
 	/* Point caches. */
 	build_object_pointcache(object);
@@ -1850,18 +1850,18 @@ void DepsgraphRelationBuilder::build_particle_systems(Object *object)
 		/* Visualization. */
 		switch (part->ren_as) {
 			case PART_DRAW_OB:
-				if (part->dup_ob != NULL) {
+				if (part->instance_object != NULL) {
 					/* Make sure object's relations are all built.  */
-					build_object(NULL, part->dup_ob);
+					build_object(NULL, part->instance_object);
 					/* Build relation for the particle visualization. */
 					build_particle_system_visualization_object(
-					        object,  psys, part->dup_ob);
+					        object,  psys, part->instance_object);
 				}
 				break;
 			case PART_DRAW_GR:
-				if (part->dup_group != NULL) {
-					build_collection(NULL, NULL, part->dup_group);
-					LISTBASE_FOREACH (CollectionObject *, go, &part->dup_group->gobject) {
+				if (part->instance_collection != NULL) {
+					build_collection(NULL, NULL, part->instance_collection);
+					LISTBASE_FOREACH (CollectionObject *, go, &part->instance_collection->gobject) {
 						build_particle_system_visualization_object(
 						        object, psys, go->ob);
 					}