[Bf-blender-cvs] [705b4f2ef0a] soc-2019-outliner: Outliner: Don't sync outliner selection to other outliners

Nathan Craddock noreply at git.blender.org
Wed Aug 14 22:18:37 CEST 2019


Commit: 705b4f2ef0aa906bf0b55991c28b0300eaef8b2c
Author: Nathan Craddock
Date:   Wed Aug 14 14:13:25 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB705b4f2ef0aa906bf0b55991c28b0300eaef8b2c

Outliner: Don't sync outliner selection to other outliners

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_sync.c b/source/blender/editors/space_outliner/outliner_sync.c
index 08f8c25bcb8..48421f2a641 100644
--- a/source/blender/editors/space_outliner/outliner_sync.c
+++ b/source/blender/editors/space_outliner/outliner_sync.c
@@ -362,26 +362,22 @@ void ED_outliner_select_sync_from_outliner(bContext *C, SpaceOutliner *soops)
 
   selected_items_free(&selected_items);
 
-  /* Set global sync select flag based on outliner selection type */
+  /* Clear sync select dirty state from current selection type */
   if (sync_types.object) {
     DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
     WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
-    ED_outliner_select_sync_from_object_tag(C);
+    soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT;
   }
   if (sync_types.edit_bone) {
-    ED_outliner_select_sync_from_edit_bone_tag(C);
+    soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE;
   }
   if (sync_types.pose_bone) {
-    ED_outliner_select_sync_from_pose_bone_tag(C);
+    soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE;
   }
   if (sync_types.sequence) {
     WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER | NA_SELECTED, scene);
-    ED_outliner_select_sync_from_sequence_tag(C);
+    soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE;
   }
-
-  /* Flag all outliners as dirty except for self */
-  ED_outliner_select_sync_flag_outliners(C);
-  soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_ALL;
 }
 
 static void outliner_select_sync_from_object(ViewLayer *view_layer,



More information about the Bf-blender-cvs mailing list