[Bf-blender-cvs] [b439a9a83f1] greasepencil-object: Cleanup: Change some xray strings and parameter names

[Antonio Vazquez]

Commit: b439a9a83f1bb556bf20b3864bc7796b8e8e6f5f
Author: Antonio Vazquez
Date:   Sat May 20 12:58:17 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb439a9a83f1bb556bf20b3864bc7796b8e8e6f5f

Cleanup: Change some xray strings and parameter names

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
M	source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
index e81cb0bb0dc..79171424e6a 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
@@ -27,7 +27,7 @@ uniform int t_clamp;
 #define TEXTURE 4
 
 #define GP_XRAY_FRONT 0
-#define GP_XRAY_SPACE 1
+#define GP_XRAY_3DSPACE 1
 #define GP_XRAY_BACK  2
 
 in vec4 finalColor;
@@ -180,7 +180,7 @@ void main()
 	if (xraymode == GP_XRAY_FRONT) {
 		gl_FragDepth = 0.0;
 	}
-	if (xraymode == GP_XRAY_SPACE) {
+	if (xraymode == GP_XRAY_3DSPACE) {
 		gl_FragDepth = gl_FragCoord.z;
 	}
 	if  (xraymode == GP_XRAY_BACK) {
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
index 622f7b4ca4d..c49f3e9e98f 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
@@ -12,7 +12,7 @@ out vec4 mColor;
 out vec2 mTexCoord;
 
 #define GP_XRAY_FRONT 0
-#define GP_XRAY_SPACE 1
+#define GP_XRAY_3DSPACE 1
 #define GP_XRAY_BACK  2
 
 /* project 3d point to 2d on screen space */
@@ -27,7 +27,7 @@ float getZdepth(vec4 point)
 	if (xraymode == GP_XRAY_FRONT) {
 		return 0.0;
 	}
-	if (xraymode == GP_XRAY_SPACE) {
+	if (xraymode == GP_XRAY_3DSPACE) {
 		return point.z / point.w;
 	}
 	if  (xraymode == GP_XRAY_BACK) {
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index a1a377ae9d9..25ce94341bc 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -287,7 +287,7 @@ typedef enum eGPDlayer_Flag {
 /* xray modes */
 typedef enum eGP_Xraymodes_Types {
 	GP_XRAY_FRONT = 0,
-	GP_XRAY_SPACE = 1,
+	GP_XRAY_3DSPACE = 1,
 	GP_XRAY_BACK  = 2
 } eGP_Xraymodes_Types;
 
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index c1b9f8ee20b..72511f3f6b0 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -55,9 +55,9 @@ static EnumPropertyItem parent_type_items[] = {
 };
 
 EnumPropertyItem rna_enum_gpencil_xraymodes_items[] = {
-	{ GP_XRAY_FRONT, "GP_XRAY_FRONT", 0, "Front", "Draw all strokes in front" },
-	{ GP_XRAY_SPACE, "GP_XRAY_SPACE", 0, "Space", "Draw strokes relative to other objects in space" },
-	{ GP_XRAY_BACK, "GP_XRAY_BACK", 0, "Back", "Draw all strokes on back" },
+	{ GP_XRAY_FRONT, "FRONT", 0, "Front", "Draw all strokes in front" },
+	{ GP_XRAY_3DSPACE, "3DSPACE", 0, "3DSpace", "Draw strokes relative to other objects in 3D space" },
+	{ GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes on back" },
 	{ 0, NULL, 0, NULL, NULL }
 };