diff options
author | Hans Goudey <h.goudey@me.com> | 2022-03-07 22:58:14 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-03-07 22:58:14 +0300 |
commit | dfd7832a0e111fe6733de95693338ac7702989c4 (patch) | |
tree | 267dc58b1c700ad2d81f08793a17465a598edf76 /source/blender/draw | |
parent | 0597902bde1f6d9a77bf04144ad7fd5f7be9d651 (diff) | |
parent | 2b3367cdf8694a3e48ed5cc2be5381aabceed9c4 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_wireframe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c index 2636d7876d5..b3c0c5da9b5 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.c +++ b/source/blender/draw/engines/overlay/overlay_wireframe.c @@ -276,8 +276,12 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata, const bool is_sculpt_mode = ((ob->mode & OB_MODE_SCULPT) != 0) && (ob->sculpt != NULL); const bool use_sculpt_pbvh = BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d) && !DRW_state_is_image_render(); + const bool is_instance = (ob->base_flag & BASE_FROM_DUPLI); + const bool instance_parent_in_edit_mode = is_instance ? DRW_object_is_in_edit_mode( + DRW_object_get_dupli_parent(ob)) : + false; const bool use_coloring = (use_wire && !is_edit_mode && !is_sculpt_mode && - !has_edit_mesh_cage); + !has_edit_mesh_cage && !instance_parent_in_edit_mode); geom = DRW_cache_object_face_wireframe_get(ob); if (geom || use_sculpt_pbvh) { |