Commit: 8ec0f0883d84cbc3ac1b887ae34327f1a250e9dd
Author: Jeroen Bakker
Date: Fri Aug 28 16:56:07 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB8ec0f0883d84cbc3ac1b887ae34327f1a250e9dd
Use overlay grid
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/draw/engines/overlay/overlay_grid.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c
b/release/datafiles/userdef/userdef_default_theme.c
index 7604a06f7df..28ef1298abb 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -714,6 +714,7 @@ const bTheme U_theme_default = {
.paint_curve_pivot = RGBA(0xff7f7f7f),
.paint_curve_handle = RGBA(0x7fff7f7f),
.metadatatext = RGBA(0xffffffff),
+ .grid = RGBA(0x060606ff),
},
.space_text = {
.back = RGBA(0x30303000),
diff --git a/source/blender/draw/engines/overlay/overlay_grid.c
b/source/blender/draw/engines/overlay/overlay_grid.c
index f238ab723ef..14ac110acb1 100644
--- a/source/blender/draw/engines/overlay/overlay_grid.c
+++ b/source/blender/draw/engines/overlay/overlay_grid.c
@@ -57,12 +57,11 @@ 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) {
- SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
shd->grid_flag = PLANE_IMAGE | SHOW_GRID;
- shd->grid_distance = sima->zoom;
+ shd->grid_distance = 1.0f;
shd->grid_mesh_size = 1.0f;
- for (int step = 0; step <= 8; step++) {
- shd->grid_steps[step] = powf(4, step) * 0.1;
+ for (int step = 0; step < 8; step++) {
+ shd->grid_steps[step] = powf(10, step) * 0.01;
}
return;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
