[Bf-blender-cvs] [6fbf342e828] soc-2020-outliner: Outliner: Fix mode column when lock object modes is disabled

[Nathan Craddock]

Commit: 6fbf342e828e431086d859f9825359ffb8463eb0
Author: Nathan Craddock
Date:   Mon Jun 15 16:57:58 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB6fbf342e828e431086d859f9825359ffb8463eb0

Outliner: Fix mode column when lock object modes is disabled

When Lock Object Modes was disabled, multiple objects would be shown as
in the interaction mode even though only one object could be edited at a
time. This was not an issue for edit and pose mode because those modes
support multi object editing. But in modes like sculpt it implied that
multiple objects could be edited at the same time.

This only draws the active icon for the active object when lock object
modes is disabled, and when there is no active edit or pose object.

===================================================================

M	source/blender/editors/space_outliner/outliner_draw.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 574d22aba30..91315b096cb 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2053,16 +2053,26 @@ static int outliner_get_mode_icon(const int mode)
 static void outliner_draw_left_column_mode_toggle(uiBlock *block,
                                                   TreeViewContext *tvc,
                                                   TreeElement *te,
-                                                  TreeStoreElem *tselem)
+                                                  TreeStoreElem *tselem,
+                                                  const bool lock_object_modes)
 {
   uiBut *but;
   const int active_mode = tvc->obact->mode;
+  bool draw_active_icon = true;
 
   if (tselem->type == 0 && te->idcode == ID_OB) {
     Object *ob = (Object *)tselem->id;
 
+    /* When not locking object modes, objects can remain in non-object modes. For modes that do not
+     * allow multi-object editing, these other objects should still show be viewed as not in the
+     * mode. Otherwise multiple objects show the same mode icon in the outliner even though only
+     * one object is actually editable in the mode. */
+    if (!lock_object_modes && ob != tvc->obact && !(tvc->ob_edit || tvc->ob_pose)) {
+      draw_active_icon = false;
+    }
+
     if (ob->type == tvc->obact->type) {
-      if (ob->mode == tvc->obact->mode) {
+      if (draw_active_icon && ob->mode == tvc->obact->mode) {
         but = uiDefIconBut(block,
                            UI_BTYPE_ICON_TOGGLE,
                            0,
@@ -2108,15 +2118,18 @@ static void outliner_draw_left_column(
     const bContext *C, uiBlock *block, TreeViewContext *tvc, SpaceOutliner *soops, ListBase *tree)
 {
   TreeStoreElem *tselem;
+  const bool lock_object_modes = tvc->scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK;
 
   LISTBASE_FOREACH (TreeElement *, te, tree) {
     tselem = TREESTORE(te);
 
     if (tvc->obact && tvc->obact->mode != OB_MODE_OBJECT) {
-      outliner_draw_left_column_mode_toggle(block, tvc, te, tselem);
+      outliner_draw_left_column_mode_toggle(block, tvc, te, tselem, lock_object_modes);
     }
     /* TODO (Nathan): Should the active icons always draw, or be hidden in non-object modes? */
-    outliner_draw_left_column_activation(C, block, tvc, te, tselem);
+    else {
+      outliner_draw_left_column_activation(C, block, tvc, te, tselem);
+    }
 
     if (TSELEM_OPEN(tselem, soops)) {
       outliner_draw_left_column(C, block, tvc, soops, &te->subtree);