[Bf-blender-cvs] [e0504dfe82f] uvimage-editor-drawing: Show UV/paint overlay when no image available

[Jeroen Bakker]

Commit: e0504dfe82f4a626e521db9e6a4d04da55c7bd60
Author: Jeroen Bakker
Date:   Wed Aug 19 14:29:34 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBe0504dfe82f4a626e521db9e6a4d04da55c7bd60

Show UV/paint overlay when no image available

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

M	source/blender/draw/engines/image/image_engine.c
M	source/blender/draw/engines/overlay/overlay_edit_uv.c

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

diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c
index b7f2b6d477f..7e20a5bee4a 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -184,7 +184,7 @@ static void image_cache_image(IMAGE_Data *id, Image *ima, ImageUser *iuser, ImBu
     /* sima->zoom = 1 texel covers (sima->zoom * sima->zoom) screen pixels.
      * Creates a curve function for better visual result. */
     float zoom_level = powf(MAX2(sima->zoom - 1.0, 0.1), 0.33f);
-    zoom_level = clamp_f(zoom_level, 1.2, 5.0);
+    zoom_level = clamp_f(zoom_level, 1.25, 4.75);
     DRW_shgroup_uniform_float_copy(grp, "zoomScale", sima->zoom);
     DRW_shgroup_uniform_float_copy(grp, "zoomLevel", zoom_level);
     DRW_shgroup_call(grp, pd->draw_batch, NULL);
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index 84897fa2323..361ce66beb1 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -135,8 +135,9 @@ void OVERLAY_edit_uv_init(OVERLAY_Data *vedata)
   const ToolSettings *ts = scene->toolsettings;
 
   Image *image = sima->image;
+  /* By design no image is an image type. This so editor shows UV's by default. */
   const bool is_image_type =
-      image && ELEM(image->type, IMA_TYPE_IMAGE, IMA_TYPE_MULTILAYER, IMA_TYPE_UV_TEST);
+      (image == NULL) || ELEM(image->type, IMA_TYPE_IMAGE, IMA_TYPE_MULTILAYER, IMA_TYPE_UV_TEST);
   const bool is_uv_editor = sima->mode == SI_MODE_UV;
   const bool has_edit_object = (draw_ctx->object_edit) != NULL;
   const bool is_paint_mode = sima->mode == SI_MODE_PAINT;
@@ -198,8 +199,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata)
             pd->edit_uv_shadow_edges_grp, "alpha", pd->edit_uv.uv_opacity);
         DRW_shgroup_uniform_float(
             pd->edit_uv_shadow_edges_grp, "dashLength", &pd->edit_uv.dash_length, 1);
-        DRW_shgroup_uniform_bool(
-            pd->edit_uv_shadow_edges_grp, "doSmoothWire", &pd->edit_uv.do_smooth_wire, 1);
+        DRW_shgroup_uniform_bool_copy(pd->edit_uv_shadow_edges_grp, "doSmoothWire", true);
       }
 
       if (pd->edit_uv.do_uv_overlay) {