[Bf-blender-cvs] [dedeee51ace] greasepencil-object: Replace hardcode value with define

[Antonio Vazquez]

Commit: dedeee51aceae6d2542a8698b8793231b4c4d405
Author: Antonio Vazquez
Date:   Sat Dec 2 10:46:30 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBdedeee51aceae6d2542a8698b8793231b4c4d405

Replace hardcode value with define

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

M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 7d62b5b6938..3be663ae31a 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -574,8 +574,8 @@ void do_versions_after_linking_280(Main *main)
 				for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_VIEW3D) {
 						View3D *v3d = (View3D *)sl;
-						v3d->gpencil_grid_size[0] = 50;
-						v3d->gpencil_grid_size[1] = 50;
+						v3d->gpencil_grid_size[0] = GP_DEFAULT_GRID_SIZE;
+						v3d->gpencil_grid_size[1] = GP_DEFAULT_GRID_SIZE;
 						ARRAY_SET_ITEMS(v3d->gpencil_paper_color, 1.0f, 1.0f, 1.0f, 0.7f);
 					}
 				}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index f0c553be4e6..a0d287588e2 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -35,6 +35,7 @@
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_gpencil_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -345,8 +346,8 @@ static SpaceLink *view3d_new(const bContext *C)
 	v3d->near = 0.01f;
 	v3d->far = 1000.0f;
 
-	v3d->gpencil_grid_size[0] = 50;
-	v3d->gpencil_grid_size[1] = 50;
+	v3d->gpencil_grid_size[0] = GP_DEFAULT_GRID_SIZE;
+	v3d->gpencil_grid_size[1] = GP_DEFAULT_GRID_SIZE;
 	ARRAY_SET_ITEMS(v3d->gpencil_paper_color, 1.0f, 1.0f, 1.0f, 0.7f);
 
 	v3d->twflag |= U.manipulator_flag & V3D_MANIPULATOR_DRAW;
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 109b352cfe6..bb25a23fb10 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -41,6 +41,7 @@ struct GHash;
 /* TODO: add size as userprefs parameter */
 #define GP_OBGPENCIL_DEFAULT_SIZE  0.2f 
 #define GP_DEFAULT_PIX_FACTOR 500 
+#define GP_DEFAULT_GRID_SIZE 100 
 
 /* ***************************************** */
 /* GP Point Weights */