diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-14 15:32:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-14 15:34:32 +0300 |
commit | 8d421f3d9b3f1f5b6822f6519927f800fc4bfbe2 (patch) | |
tree | 8041753b7471c368416575282d7f728c3aca548b /source/blender/editors | |
parent | 816c135270c64e96fb5a923855539dc106ac05d7 (diff) |
Fix T56665: Assert when selecting object
Selecting object w/ a different mode missed refreshing the screen
areas current tool.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_select.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index aed074907b7..0ae04ab9b33 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -65,6 +65,7 @@ #include "WM_api.h" #include "WM_types.h" +#include "WM_message.h" #include "ED_armature.h" #include "ED_object.h" @@ -119,11 +120,13 @@ void ED_object_base_select(Base *base, eObjectSelect_Mode mode) */ void ED_object_base_activate(bContext *C, Base *base) { + struct wmMsgBus *mbus = CTX_wm_message_bus(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); view_layer->basact = base; WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene); + WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active); DEG_id_tag_update(&CTX_data_scene(C)->id, ID_RECALC_SELECT); } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 264e21fa065..7648a67da8b 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1086,6 +1086,9 @@ static void view3d_main_region_message_subscribe( WM_msg_subscribe_rna_anon_prop( mbus, Object, mode, &msg_sub_value_region_tag_refresh); + WM_msg_subscribe_rna_anon_prop( + mbus, LayerObjects, active, + &msg_sub_value_region_tag_refresh); } } |