diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-04-02 16:05:41 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-04-02 16:07:56 +0300 |
| commit | fa8a3c8f26f4eeb09d5d8b2792d32887be4fe111 (patch) | |
| tree | b2c918af88c2799311f7566fd770600207b9ca7d /source/blender/draw/intern | |
| parent | 7bffdab93c40d6de0410f767cdb24ebe1e478344 (diff) | |
Revert "Fix T72688: Vertex Group Weights in Edit Mode Occludes In Front Armatures"
This reverts commit 782e6ea4edd9cb09f2583c8f28a24d6330dc6ce8.
Said fix introduced a crash the moment one goes to edit mode.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 1b169dbee1d..b265035f449 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -145,8 +145,11 @@ bool DRW_object_is_renderable(const Object *ob) if (ob->type == OB_MESH) { if ((ob == DST.draw_ctx.object_edit) || DRW_object_is_in_edit_mode(ob)) { + View3D *v3d = DST.draw_ctx.v3d; - if (v3d && v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_OCCLUDE_WIRE) { + const int mask = (V3D_OVERLAY_EDIT_OCCLUDE_WIRE | V3D_OVERLAY_EDIT_WEIGHT); + + if (v3d && v3d->overlay.edit_flag & mask) { return false; } } |