Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-07-03 00:12:11 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-07-05 18:24:31 +0300
commit68c39e2b41174f20c2c5f478ca5876f3be8d4c24 (patch)
tree1bb74cd72b9e3f57642eae258c02f3ccc0322870 /source
parent7b93aebff942ffc45bf706e5ba2e031abe6c2a41 (diff)
Fix T66327 1/2: Outliner dupli empty is shown as collection when a different duplitype
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c2
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 768a375675e..7451c8672f4 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -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) {
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index d428a190549..421284f905b 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -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);
}
}