[Bf-blender-cvs] [2608109308a] soc-2019-outliner: Preserve existing dirty flags when flagging outliners
Nathan Craddock
noreply at git.blender.org
Wed Aug 7 01:19:23 CEST 2019
Commit: 2608109308a8ffa004d579f4adc780f45653349c
Author: Nathan Craddock
Date: Tue Aug 6 10:15:12 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB2608109308a8ffa004d579f4adc780f45653349c
Preserve existing dirty flags when flagging 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 71654f47ac9..e827f1da06d 100644
--- a/source/blender/editors/space_outliner/outliner_sync.c
+++ b/source/blender/editors/space_outliner/outliner_sync.c
@@ -89,7 +89,7 @@ void ED_outliner_select_sync_flag_outliners(const bContext *C)
SpaceOutliner *soutliner = (SpaceOutliner *)sl;
/* Mark selection state as dirty */
- soutliner->sync_select_dirty = wm->outliner_sync_select_dirty;
+ soutliner->sync_select_dirty |= wm->outliner_sync_select_dirty;
}
}
}
More information about the Bf-blender-cvs
mailing list