griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T66327 1/2: Outliner dupli empty is shown as collection when a different duplitype

Browse Source
This commit is contained in:
Dalai Felinto
2019-07-02 18:12:11 -03:00
parent 7b93aebff9
commit 68c39e2b41
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/outliner_draw.c
View File

@@ -2203,7 +2203,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
data.icon = ICON_OUTLINER_OB_LIGHTPROBE;
break;
case OB_EMPTY:
if (ob->instance_collection) {
if (ob->instance_collection && (ob->transflag & OB_DUPLICOLLECTION)) {
data.icon = ICON_OUTLINER_OB_GROUP_INSTANCE;
}
else if (ob->empty_drawtype == OB_EMPTY_IMAGE) {

2
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -515,7 +515,7 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
}
/* duplicated group */
if (ob->instance_collection) {
if (ob->instance_collection && (ob->transflag & OB_DUPLICOLLECTION)) {
outliner_add_element(soops, &te->subtree, ob->instance_collection, te, 0, 0);
}
}