[Bf-blender-cvs] [42a551d2ddb] master: Fix T72220: Hide Edit Overlays

[Jeroen Bakker]

Commit: 42a551d2ddbbd7eef8277b368245b0865b0d809b
Author: Jeroen Bakker
Date:   Fri Dec 6 08:46:32 2019 +0100
Branches: master
https://developer.blender.org/rB42a551d2ddbbd7eef8277b368245b0865b0d809b

Fix T72220: Hide Edit Overlays

The edit overlays were drawn dispite of the global hide overlays toggle.
This patch checks the global hide overlay toggle to see if it needs to draw
these overlays.

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D6371

===================================================================

M	source/blender/draw/engines/overlay/overlay_engine.c

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index 5ad24246238..41d099772ee 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -224,7 +224,7 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
     OVERLAY_pose_cache_populate(vedata, ob);
   }
 
-  if (in_edit_mode) {
+  if (in_edit_mode && !pd->hide_overlays) {
     switch (ob->type) {
       case OB_MESH:
         OVERLAY_edit_mesh_cache_populate(vedata, ob);
@@ -281,20 +281,22 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
     OVERLAY_motion_path_cache_populate(vedata, ob);
   }
 
-  switch (ob->type) {
-    case OB_ARMATURE:
-      if (draw_bones && (is_select || (!in_edit_mode && !in_pose_mode))) {
-        OVERLAY_armature_cache_populate(vedata, ob);
-      }
-      break;
-    case OB_MBALL:
-      if (!in_edit_mode) {
-        OVERLAY_metaball_cache_populate(vedata, ob);
-      }
-      break;
-    case OB_GPENCIL:
-      OVERLAY_gpencil_cache_populate(vedata, ob);
-      break;
+  if (!pd->hide_overlays) {
+    switch (ob->type) {
+      case OB_ARMATURE:
+        if (draw_bones && (is_select || (!in_edit_mode && !in_pose_mode))) {
+          OVERLAY_armature_cache_populate(vedata, ob);
+        }
+        break;
+      case OB_MBALL:
+        if (!in_edit_mode) {
+          OVERLAY_metaball_cache_populate(vedata, ob);
+        }
+        break;
+      case OB_GPENCIL:
+        OVERLAY_gpencil_cache_populate(vedata, ob);
+        break;
+    }
   }
   /* Non-Meshes */
   if (draw_extras) {