Commit: e33a16317de0fee70d7581a8d0f32fe9de477409
Author: Antonioya
Date: Sat Jul 28 16:43:49 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe33a16317de0fee70d7581a8d0f32fe9de477409
Minor changes to grid
- Use half number of lines in loop to be equal UI parameter
- Cleanup typo errors
- Change default number of lines
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 159ea4d2eb7..1241c88b061 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -640,7 +640,7 @@ GPUBatch *DRW_gpencil_get_grid(void)
uchar col_grid[3];
UI_GetThemeColor3ubv(TH_GRID, col_grid);
- /* verify we have soemthing to draw */
+ /* verify we have something to draw */
if (v3d->gpencil_grid_lines < 4) {
v3d->gpencil_grid_lines = GP_DEFAULT_GRID_LINES;
}
@@ -655,7 +655,7 @@ GPUBatch *DRW_gpencil_get_grid(void)
const int axis = v3d->gpencil_grid_axis;
const char *grid_unit = NULL;
- const int gridlines = v3d->gpencil_grid_lines;
+ const int gridlines = v3d->gpencil_grid_lines / 2;
const float grid_scale = v3d->gpencil_grid_scale *
ED_scene_grid_scale(scene, &grid_unit);
const float grid = gridlines * grid_scale;
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index 12ab5b79b50..fdb4bd9c68f 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -42,7 +42,7 @@ struct MDeformVert;
/* TODO: add size as userprefs parameter */
#define GP_OBGPENCIL_DEFAULT_SIZE 0.2f
#define GP_DEFAULT_PIX_FACTOR 1.0f
-#define GP_DEFAULT_GRID_LINES 20
+#define GP_DEFAULT_GRID_LINES 30
#define GP_MAX_INPUT_SAMPLES 10
/* ***************************************** */
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index 51972374533..061d48dfd7d 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2897,7 +2897,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
/* Paper opacity factor */
prop = RNA_def_property(srna, "gpencil_paper_opacity", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "gpencil_paper_opacity");
- RNA_def_property_range(prop, 0.0, 1.0f);
+ RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_float_default(prop, 0.5f);
RNA_def_property_ui_text(prop, "Opacity", "Paper opacity");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
