Commit: 90e07364ac70ed8f2f33f2b07f1f81388ad8667e
Author: Nathan Craddock
Date: Wed Aug 14 15:05:42 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB90e07364ac70ed8f2f33f2b07f1f81388ad8667e
Outliner: Clear dirty flag after sync from outliner
This prevents syncing to the outliner on draw which deselects
non-syncable data like mesh data and collections.
===================================================================
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 48421f2a641..63c7b7fe4a0 100644
--- a/source/blender/editors/space_outliner/outliner_sync.c
+++ b/source/blender/editors/space_outliner/outliner_sync.c
@@ -362,22 +362,17 @@ void ED_outliner_select_sync_from_outliner(bContext *C,
SpaceOutliner *soops)
selected_items_free(&selected_items);
- /* Clear sync select dirty state from current selection type */
+ /* Tag for updates */
if (sync_types.object) {
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
- soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_OBJECT;
- }
- if (sync_types.edit_bone) {
- soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE;
- }
- if (sync_types.pose_bone) {
- 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);
- soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE;
}
+
+ /* Clear outliner sync select dirty flag to prevent a sync to the outliner
on draw */
+ soops->sync_select_dirty &= ~WM_OUTLINER_SYNC_SELECT_FROM_ALL;
}
static void outliner_select_sync_from_object(ViewLayer *view_layer,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
