Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_tools.c
index b23ea8e4daeb8a0f84990503fe0591f306c2ff18..190ef9fa229c2db1f02d10de31991b3e95f7c457 100644 (file)
@@ -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;