Merge branch 'blender-v2.82-release'

2 files changed, 10 insertions, 1 deletions

diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 97290abe4b7..c31e63b2550 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -2335,6 +2335,11 @@ void OVERLAY_armature_cache_populate(OVERLAY_Data *vedata, Object *ob)
   OVERLAY_PrivateData *pd = vedata->stl->pd;
   ArmatureDrawContext arm_ctx;
   float *color;
+
+  if (ob->dt == OB_BOUNDBOX) {
+    return;
+  }
+
   DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color);
   armature_context_setup(&arm_ctx, pd, ob, false, false, false, color);
   draw_armature_pose(&arm_ctx);
diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
index 6a65be0b84c..e016ccc6c0e 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
@@ -407,7 +407,11 @@ void OVERLAY_edit_mesh_draw(OVERLAY_Data *vedata)
       GPU_framebuffer_clear_depth(fbl->overlay_default_fb, 1.0f);
     }
 
-    DRW_draw_pass(psl->edit_mesh_depth_ps[IN_FRONT]);
+    if (!DRW_pass_is_empty(psl->edit_mesh_depth_ps[IN_FRONT])) {
+      DRW_view_set_active(NULL);
+      DRW_draw_pass(psl->edit_mesh_depth_ps[IN_FRONT]);
+    }
+
     overlay_edit_mesh_draw_components(psl, pd, true);
   }
 }