[Bf-blender-cvs] [3e55d7d6054] blender-v2.92-release: Fix T85499: Crash on switching to edit mode with uv editor open
Falk David
noreply at git.blender.org
Mon Feb 15 20:11:06 CET 2021
Commit: 3e55d7d60542bd00fe0a200da66d99582cc387e0
Author: Falk David
Date: Mon Feb 15 20:08:42 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB3e55d7d60542bd00fe0a200da66d99582cc387e0
Fix T85499: Crash on switching to edit mode with uv editor open
A fix for T83187 (rBf83aa830) assumed in the overlay code of the uv editor that the object was a mesh
when it did not have to be - causing a crash.
The fix makes sure that the object is a mesh.
Reviewed By: jbakker, campbellbarton
Maniphest Tasks: T85499, T85495
Differential Revision: https://developer.blender.org/D10369
===================================================================
M source/blender/draw/engines/overlay/overlay_edit_uv.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index 22433905b75..336b03ee284 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -401,7 +401,8 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata)
/* HACK: When editing objects that share the same mesh we should only draw the
* first one in the order that is used during uv editing. We can only trust that the first object
* has the correct batches with the correct selection state. See T83187. */
- if (pd->edit_uv.do_uv_overlay || pd->edit_uv.do_uv_shadow_overlay) {
+ if ((pd->edit_uv.do_uv_overlay || pd->edit_uv.do_uv_shadow_overlay) &&
+ draw_ctx->obact->type == OB_MESH) {
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_mode_unique_data(
draw_ctx->view_layer, NULL, &objects_len, draw_ctx->object_mode);
More information about the Bf-blender-cvs
mailing list