[Bf-blender-cvs] [89c156d8887] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner
Nathan Craddock
noreply at git.blender.org
Sun Jul 7 06:24:49 CEST 2019
Commit: 89c156d888721d480742ed773ce160d401bb7b6b
Author: Nathan Craddock
Date: Sat Jul 6 14:56:41 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB89c156d888721d480742ed773ce160d401bb7b6b
Merge branch 'master' into soc-2019-outliner
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_select.c
index 7e114412bc5,da06707ebac..d932953d362
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@@ -117,11 -116,21 +117,24 @@@ void ED_object_base_select(Base *base,
}
BKE_scene_object_base_flag_sync_from_base(base);
}
+
+ /* Set synced selection global declared in ED_outliner.h */
+ sync_select_dirty_flag = SYNC_SELECT_REPLACE;
}
+ /**
+ * Call when the active base has changed.
+ */
+ void ED_object_base_active_refresh(Main *bmain, Scene *scene, ViewLayer *view_layer)
+ {
+ WM_main_add_notifier(NC_SCENE | ND_OB_ACTIVE, scene);
+ DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
+ struct wmMsgBus *mbus = ((wmWindowManager *)bmain->wm.first)->message_bus;
+ if (mbus != NULL) {
+ WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active);
+ }
+ }
+
/**
* Change active base, it includes the notifier
*/
More information about the Bf-blender-cvs
mailing list