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/engines/overlay/overlay_engine.c | |
| 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/engines/overlay/overlay_engine.c')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_engine.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index 19b0fa5e12b..e0b599f43a9 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -106,14 +106,10 @@ static void OVERLAY_cache_init(void *vedata) OVERLAY_Data *data = vedata; OVERLAY_StorageList *stl = data->stl; OVERLAY_PrivateData *pd = stl->pd; - const bool draw_edit_weights = (pd->edit_mesh.flag & V3D_OVERLAY_EDIT_WEIGHT); switch (pd->ctx_mode) { case CTX_MODE_EDIT_MESH: OVERLAY_edit_mesh_cache_init(vedata); - if (draw_edit_weights) { - OVERLAY_paint_cache_init(vedata); - } break; case CTX_MODE_EDIT_SURFACE: case CTX_MODE_EDIT_CURVE: @@ -255,7 +251,6 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob) (ob->base_flag & BASE_SELECTED); const bool draw_bone_selection = (ob->type == OB_MESH) && pd->armature.do_pose_fade_geom && !is_select; - const bool draw_edit_weights = in_edit_mode && (pd->edit_mesh.flag & V3D_OVERLAY_EDIT_WEIGHT); const bool draw_extras = (!pd->hide_overlays) && (((pd->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) == 0) || @@ -284,9 +279,6 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob) switch (ob->type) { case OB_MESH: OVERLAY_edit_mesh_cache_populate(vedata, ob); - if (draw_edit_weights) { - OVERLAY_paint_weight_cache_populate(vedata, ob); - } break; case OB_ARMATURE: if (draw_bones) { @@ -503,7 +495,6 @@ static void OVERLAY_draw_scene(void *vedata) switch (pd->ctx_mode) { case CTX_MODE_EDIT_MESH: - OVERLAY_paint_draw(vedata); OVERLAY_edit_mesh_draw(vedata); break; case CTX_MODE_EDIT_SURFACE: |