GP: Redesign wireframe mode

Now it's possible use the different Wire modes (Single, Object & Random)

Also support for x-ray mode.

For random colors, the name of the object and the name of the layer is used.

Also some parameters cleanup.

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
index f870bfbb48d..047c2a1160c 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
@@ -5,6 +5,8 @@ uniform float pixsize;   /* rv3d->pixsize */
 uniform int keep_size;
 uniform float objscale;
 uniform float pixfactor;
+uniform int shading_type;
+uniform vec4 wire_color;
 
 in vec3 pos;
 in vec4 color;
@@ -17,6 +19,8 @@ out vec2 finaluvdata;
 
 #define TRUE 1
 
+#define OB_WIRE 2
+
 float defaultpixsize = pixsize * (1000.0 / pixfactor);
 
 void main()
@@ -31,6 +35,12 @@ void main()
 		float size = (ProjectionMatrix[3][3] == 0.0) ? (thickness / (gl_Position.z * defaultpixsize)) : (thickness / defaultpixsize);
 		finalThickness = max(size * objscale, 4.0); /* minimum 4 pixels */
 	}
+	
+	/* for wireframe override size and color */
+	if (shading_type == OB_WIRE) {
+		finalThickness = 2.0;
+		finalColor = wire_color;
+	}
 
 	finaluvdata = uvdata;
 }