[Bf-blender-cvs] [b311548de8b] uvimage-editor-drawing: Merge branch 'master' into uvimage-unavailability-grid

[Jeroen Bakker]

Commit: b311548de8b5ca9b3f96a539f3945aa2095ecc20
Author: Jeroen Bakker
Date:   Fri Aug 28 14:53:01 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBb311548de8b5ca9b3f96a539f3945aa2095ecc20

Merge branch 'master' into uvimage-unavailability-grid

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



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

diff --cc source/blender/blenloader/intern/versioning_userdef.c
index d04907872b7,d04907872b7..de4cff0101d
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -233,6 -233,6 +233,8 @@@ static void do_versions_theme(const Use
       * the outliner's, and it's less disruptive to just copy them. */
      copy_v4_v4_uchar(btheme->space_file.back, btheme->space_outliner.back);
      copy_v4_v4_uchar(btheme->space_file.row_alternate, btheme->space_outliner.row_alternate);
++
++    FROM_DEFAULT_V4_UCHAR(space_image.grid);
    }
  
  #undef FROM_DEFAULT_V4_UCHAR
diff --cc source/blender/draw/engines/overlay/overlay_grid.c
index ddd15f196bf,e3079870d8f..f238ab723ef
--- a/source/blender/draw/engines/overlay/overlay_grid.c
+++ b/source/blender/draw/engines/overlay/overlay_grid.c
@@@ -49,30 -48,8 +49,24 @@@ void OVERLAY_grid_init(OVERLAY_Data *ve
  {
    OVERLAY_PrivateData *pd = vedata->stl->pd;
    OVERLAY_ShadingData *shd = &pd->shdata;
 -
+   const DRWContextState *draw_ctx = DRW_context_state_get();
 +
 +  shd->grid_flag = 0;
 +  shd->zneg_flag = 0;
 +  shd->zpos_flag = 0;
 +  shd->grid_line_size = max_ff(0.0f, U.pixelsize - 1.0f) * 0.5f;
 +
 +  if (pd->is_image_editor) {
++    SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
 +    shd->grid_flag = PLANE_IMAGE | SHOW_GRID;
-     shd->grid_distance = 10.0f;
++    shd->grid_distance = sima->zoom;
 +    shd->grid_mesh_size = 1.0f;
-     const float multiplier = 0.01f;
-     shd->grid_steps[0] = 1 * multiplier;
-     shd->grid_steps[1] = 10 * multiplier;
-     shd->grid_steps[2] = 100 * multiplier;
-     shd->grid_steps[3] = 1000 * multiplier;
-     shd->grid_steps[4] = 10000 * multiplier;
-     shd->grid_steps[5] = 100000 * multiplier;
-     shd->grid_steps[6] = 1000000 * multiplier;
-     shd->grid_steps[7] = 10000000 * multiplier;
-     shd->grid_steps[8] = 100000000 * multiplier;
++    for (int step = 0; step <= 8; step++) {
++      shd->grid_steps[step] = powf(4, step) * 0.1;
++    }
 +    return;
 +  }
 +
-   const DRWContextState *draw_ctx = DRW_context_state_get();
    View3D *v3d = draw_ctx->v3d;
    Scene *scene = draw_ctx->scene;
    RegionView3D *rv3d = draw_ctx->rv3d;