[Bf-blender-cvs] [137fdb1a660] greasepencil-object: Move define to share

Antonio Vazquez noreply at git.blender.org
Sun Jul 23 17:54:52 CEST 2017


Commit: 137fdb1a660a93d99113defa60a4e2f6615b8c5a
Author: Antonio Vazquez
Date:   Sun Jul 23 16:25:11 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB137fdb1a660a93d99113defa60a4e2f6615b8c5a

Move define to share

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

M	source/blender/editors/include/ED_gpencil.h
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index e829e1131a3..3ec68267123 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -200,8 +200,6 @@ void ED_gpencil_parent_location(struct Object *obact, struct bGPdata *gpd, struc
 void ED_gpencil_reset_layers_parent(struct Object *obact, struct bGPdata *gpd);
 
 /* ------------ Object Utilities ------------ */
-/* TODO: add size as userprefs parameter */
-#define GP_OBGPENCIL_DEFAULT_SIZE  0.5f 
 struct Object *ED_add_gpencil_object(struct bContext *C, struct Scene *scene, const float loc[3]);
 void ED_gpencil_add_defaults(struct bContext *C);
 
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index ddf61aa0d16..0f9e74eca7c 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -37,6 +37,9 @@
 struct AnimData;
 struct CurveMapping;
 
+/* TODO: add size as userprefs parameter */
+#define GP_OBGPENCIL_DEFAULT_SIZE  0.5f 
+
 /* Grease-Pencil Annotations - 'Stroke Point'
  *	-> Coordinates may either be 2d or 3d depending on settings at the time
  * 	-> Coordinates of point on stroke, in proportions of window size




More information about the Bf-blender-cvs mailing list