diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-21 20:06:20 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-21 20:46:15 +0300 |
| commit | 53d1f893228f4e79d7ab847b9499432655ce8b5e (patch) | |
| tree | d417f79b6b6d3caab847837ddfd244b8dca7a281 /source/blender/editors/mesh/meshtools.c | |
| parent | 70500121b457d1bb7ce6aeab39eb3c4c30a6ffe3 (diff) | |
Fix T79987: Crash when joining objects
Mistake in b077de086e14. I did the same fix for a few operators there,
but missed the object "Join" one.
The joining operator changes the layer content. So it must send a
notifier for that.
Before b077de086e14 that didn't cause a noticeable issue, because the
Outliner happened to listen to other notifiers (active/selection
changes) the operator sent and fully rebuilt its tree in response. Now
missing these notifiers can be more problematic, since we try to avoid
more rebuilds.
Added comments to the notifier types to avoid at least this pitfall.
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 5278da67777..e89d2726c06 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -741,6 +741,7 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op) DEG_id_tag_update(&scene->id, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene); + WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene); return OPERATOR_FINISHED; } |