diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 13:02:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 13:06:51 +0300 |
commit | 29c106924408a508b2f37af9e09d9eb46adc6fad (patch) | |
tree | 1858cfeb59d259a434da39848ee130ae8aa63627 /source/blender/editors/space_outliner | |
parent | 7a4d5b78ea061196f7bf1550928680e9f094e38b (diff) |
Cleanup: code style
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 4368b74f8a7..64a9c901175 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1516,7 +1516,7 @@ static void outliner_draw_iconrow( const int num_subtypes = (i == INDEX_ID_OB) ? OB_TYPE_MAX : 1; /* See tree_element_id_type_to_index for the index logic. */ int index_base = i; - if (i > INDEX_ID_OB){ + if (i > INDEX_ID_OB) { index_base += OB_TYPE_MAX; } for (int j = 0; j < num_subtypes; j++) { diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 13b62b766f5..01df653c86d 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1493,7 +1493,8 @@ static void outliner_add_layer_collections_recursive( const bool exclude = (lc->flag & LAYER_COLLECTION_EXCLUDE) != 0; if (exclude || ((layer->runtime_flag & VIEW_LAYER_HAS_HIDE) && - !(lc->runtime_flag & LAYER_COLLECTION_HAS_VISIBLE_OBJECTS))) { + !(lc->runtime_flag & LAYER_COLLECTION_HAS_VISIBLE_OBJECTS))) + { ten->flag |= TE_DISABLED; } @@ -2268,5 +2269,3 @@ void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, Spa BKE_main_id_clear_newpoins(mainvar); } - - |