diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 15:41:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 15:41:52 +0300 |
| commit | 79dabc537e3e345c3e536a6369b1d130942155c3 (patch) | |
| tree | f590f04ff819c33d0b9185f4a361f92ad79404c1 /source/blender/editors/space_outliner/outliner_select.c | |
| parent | b0c32818ba401a81c18f89f931d4336d8e859bc2 (diff) | |
| parent | 3527857cdca1f5d07037f20fed9840efe1954a57 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index bc514914b81..7ab13f36953 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -1028,7 +1028,7 @@ void outliner_item_select(SpaceOops *soops, const TreeElement *te, const bool ex const short new_flag = toggle ? (tselem->flag ^ TSE_SELECTED) : (tselem->flag | TSE_SELECTED); if (extend == false) { - outliner_set_flag(&soops->tree, TSE_SELECTED, false); + outliner_flag_set(&soops->tree, TSE_SELECTED, false); } tselem->flag = new_flag; } @@ -1039,8 +1039,8 @@ static void outliner_item_toggle_closed(TreeElement *te, const bool toggle_child if (toggle_children) { tselem->flag &= ~TSE_CLOSED; - const bool all_opened = !outliner_has_one_flag(&te->subtree, TSE_CLOSED, 1); - outliner_set_flag(&te->subtree, TSE_CLOSED, all_opened); + const bool all_opened = !outliner_flag_is_any_test(&te->subtree, TSE_CLOSED, 1); + outliner_flag_set(&te->subtree, TSE_CLOSED, all_opened); } else { tselem->flag ^= TSE_CLOSED; |