diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
| commit | 319b9d6501f2170dcf06b10de0add340d0be83a3 (patch) | |
| tree | d43beea169beef1fae3c2f253e4aab7fc116bad8 /source/blender/editors/space_outliner | |
| parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) | |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/editors/space_outliner')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index e71e518c2c7..9349e2b6a56 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -562,7 +562,7 @@ static int collection_instance_exec(bContext *C, wmOperator *UNUSED(op)) GSET_ITER(collections_to_edit_iter, data.collections_to_edit) { Collection *collection = BLI_gsetIterator_getKey(&collections_to_edit_iter); Object *ob = ED_object_add_type(C, OB_EMPTY, collection->id.name + 2, scene->cursor.location, NULL, false, 0); - ob->dup_group = collection; + ob->instance_collection = collection; ob->transflag |= OB_DUPLICOLLECTION; id_lib_extern(&collection->id); } diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index d75a11a98c6..2c43bcd5639 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1304,7 +1304,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case OB_LIGHTPROBE: data.icon = ICON_OUTLINER_OB_LIGHTPROBE; break; case OB_EMPTY: - if (ob->dup_group) { + if (ob->instance_collection) { data.icon = ICON_OUTLINER_OB_GROUP_INSTANCE; } else if (ob->empty_drawtype == OB_EMPTY_IMAGE) { diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index f14294d06e1..651f81de792 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -220,7 +220,7 @@ static void unlink_collection_cb( if (tsep) { if (GS(tsep->id->name) == ID_OB) { Object *ob = (Object *)tsep->id; - ob->dup_group = NULL; + ob->instance_collection = NULL; DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM); DEG_relations_tag_update(bmain); } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 12e2a9b8d80..f1bf15bbd0c 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -478,8 +478,8 @@ static void outliner_add_object_contents(SpaceOutliner *soops, TreeElement *te, } /* duplicated group */ - if (ob->dup_group) - outliner_add_element(soops, &te->subtree, ob->dup_group, te, 0, 0); + if (ob->instance_collection) + outliner_add_element(soops, &te->subtree, ob->instance_collection, te, 0, 0); } |