[Bf-blender-cvs] [524a2ec533c] uvimage-editor-drawing: Don't draw grid when there is an image

[Jeroen Bakker]

Commit: 524a2ec533c62de77016010b1d5b725f8c53d68d
Author: Jeroen Bakker
Date:   Mon Aug 31 10:42:59 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB524a2ec533c62de77016010b1d5b725f8c53d68d

Don't draw grid when there is an image

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

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

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

diff --git a/source/blender/draw/engines/overlay/overlay_grid.c b/source/blender/draw/engines/overlay/overlay_grid.c
index 14ac110acb1..b078d8fe240 100644
--- a/source/blender/draw/engines/overlay/overlay_grid.c
+++ b/source/blender/draw/engines/overlay/overlay_grid.c
@@ -57,7 +57,9 @@ void OVERLAY_grid_init(OVERLAY_Data *vedata)
   shd->grid_line_size = max_ff(0.0f, U.pixelsize - 1.0f) * 0.5f;
 
   if (pd->is_image_editor) {
-    shd->grid_flag = PLANE_IMAGE | SHOW_GRID;
+    const SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
+    const Image *image = sima->image;
+    shd->grid_flag = (image == NULL) ? PLANE_IMAGE | SHOW_GRID : 0;
     shd->grid_distance = 1.0f;
     shd->grid_mesh_size = 1.0f;
     for (int step = 0; step < 8; step++) {
@@ -181,7 +183,10 @@ void OVERLAY_grid_init(OVERLAY_Data *vedata)
 
 void OVERLAY_grid_cache_init(OVERLAY_Data *vedata)
 {
-  OVERLAY_ShadingData *shd = &vedata->stl->pd->shdata;
+  OVERLAY_StorageList *stl = vedata->stl;
+  OVERLAY_PrivateData *pd = stl->pd;
+  OVERLAY_ShadingData *shd = &pd->shdata;
+
   OVERLAY_PassList *psl = vedata->psl;
   DefaultTextureList *dtxl = DRW_viewport_texture_list_get();