[Bf-blender-cvs] [1b477901118] greasepencil-object: Cleanup: Whitespace

Joshua Leung noreply at git.blender.org
Tue Jul 24 07:26:36 CEST 2018


Commit: 1b47790111844fcd3204f55ad05a6829bf241a89
Author: Joshua Leung
Date:   Fri Jul 20 15:13:34 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB1b47790111844fcd3204f55ad05a6829bf241a89

Cleanup: Whitespace

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

M	source/blender/gpu/intern/gpu_shader.c
M	source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl

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

diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 0ecce7fe6f3..23efb83a034 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -873,8 +873,8 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
 		                                  datatoc_gpu_shader_2D_nodelink_frag_glsl },
 
 		[GPU_SHADER_GPENCIL_STROKE] = { datatoc_gpu_shader_gpencil_stroke_vert_glsl,
-									    datatoc_gpu_shader_gpencil_stroke_frag_glsl,
-			                            datatoc_gpu_shader_gpencil_stroke_geom_glsl },
+		                                datatoc_gpu_shader_gpencil_stroke_frag_glsl,
+		                                datatoc_gpu_shader_gpencil_stroke_geom_glsl },
 
 		[GPU_SHADER_GPENCIL_FILL] = { datatoc_gpu_shader_gpencil_fill_vert_glsl,
 		                              datatoc_gpu_shader_gpencil_fill_frag_glsl },
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
index 6e0c94f58af..3de1bd838b3 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
@@ -74,7 +74,7 @@ void main(void)
 	vec2 miter_a = normalize(n0 + n1);	// miter at start of current segment
 	vec2 miter_b = normalize(n1 + n2);  // miter at end of current segment
 
-    /* determine the length of the miter by projecting it onto normal and then inverse it */
+	/* determine the length of the miter by projecting it onto normal and then inverse it */
 	float an1 = dot(miter_a, n1);
 	float bn1 = dot(miter_b, n2);
 	if (an1 == 0) an1 = 1;



More information about the Bf-blender-cvs mailing list