[Bf-blender-cvs] [99ceaf2ecc6] soc-2019-outliner: Synced Selection: Fix syncing not working

[Nathan Craddock]

Commit: 99ceaf2ecc6c0364c8293e602ef269acaf424d99
Author: Nathan Craddock
Date:   Tue Jun 25 07:32:54 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB99ceaf2ecc6c0364c8293e602ef269acaf424d99

Synced Selection: Fix syncing not working

Removing some changes that were supposed to address extending
the selection, but they were preventing the replace selection
from behaving properly.

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

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 10244f61ba4..6b414abd566 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -3593,17 +3593,11 @@ static void outliner_sync_selection_from_view_layer(ViewLayer *view_layer, ListB
                                         BKE_view_layer_base_find(view_layer, ob);
         const bool is_selected = (base != NULL) && ((base->flag & BASE_SELECTED) != 0);
 
-        if (G_MAIN->sync_select_dirty_flag == SYNC_SELECT_EXTEND) {
-          puts("extend mode");
+        if (is_selected) {
+          tselem->flag |= TSE_SELECTED;
         }
-
-        if (base && G_MAIN->sync_select_dirty_flag != SYNC_SELECT_EXTEND) {
-          if (is_selected) {
-            tselem->flag |= TSE_SELECTED;
-          }
-          else if (G_MAIN->sync_select_dirty_flag != SYNC_SELECT_EXTEND) {
-            tselem->flag &= ~TSE_SELECTED;
-          }
+        else if (G_MAIN->sync_select_dirty_flag != SYNC_SELECT_EXTEND) {
+          tselem->flag &= ~TSE_SELECTED;
         }
       }
     }