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_tools.c | |
| parent | b0c32818ba401a81c18f89f931d4336d8e859bc2 (diff) | |
| parent | 3527857cdca1f5d07037f20fed9840efe1954a57 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index b23ea8e4dae..190ef9fa229 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1817,8 +1817,8 @@ static int do_outliner_operation_event(bContext *C, ARegion *ar, SpaceOops *soop /* select object that's clicked on and popup context menu */ if (!(tselem->flag & TSE_SELECTED)) { - if (outliner_has_one_flag(&soops->tree, TSE_SELECTED, 1)) - outliner_set_flag(&soops->tree, TSE_SELECTED, 0); + if (outliner_flag_is_any_test(&soops->tree, TSE_SELECTED, 1)) + outliner_flag_set(&soops->tree, TSE_SELECTED, 0); tselem->flag |= TSE_SELECTED; |