Cleanup: trailing space
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Mar 2019 21:16:55 +0000 (08:16 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Mar 2019 21:16:55 +0000 (08:16 +1100)
release/scripts/startup/bl_ui/space_view3d.py
source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl
source/blender/editors/gpencil/gpencil_primitive.c

index 86ee165..8daf350 100644 (file)
@@ -5684,7 +5684,7 @@ class VIEW3D_PT_gpencil_sculpt_specials(Panel):
 
         layout.separator()
 
-        # Frames 
+        # Frames
         layout.label(text="Frames:")
 
         layout.operator_context = 'INVOKE_REGION_WIN'
@@ -5717,7 +5717,7 @@ class VIEW3D_PT_gpencil_draw_specials(Panel):
 
         layout.separator()
 
-        # Frames 
+        # Frames
         layout.label(text="Frames:")
 
         layout.operator_context = 'INVOKE_REGION_WIN'
index f0878c8..7f3bbf1 100644 (file)
@@ -170,10 +170,10 @@ void main()
        if (shading_type[0] == OB_WIRE) {
                fragColor = wire_color;
        }
-       
+
        /* for solid override color */
        if (shading_type[0] == OB_SOLID) {
-               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { 
+               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) {
                        fragColor = wire_color;
                }
                if (viewport_xray == 1) {
index b367d15..2606bbf 100644 (file)
@@ -40,7 +40,7 @@ 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[0] == OB_WIRE) {
                finalThickness = 2.0;
@@ -48,7 +48,7 @@ void main()
        }
        /* for solid override color */
        if (shading_type[0] == OB_SOLID) {
-               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { 
+               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) {
                        finalColor = wire_color;
                }
                if (viewport_xray == 1) {
index dad482b..80fa899 100644 (file)
@@ -31,7 +31,7 @@ void main()
        if (color_type == GPENCIL_COLOR_SOLID) {
                fragColor = tColor;
        }
-       
+
        /* texture for endcaps */
        vec4 text_color;
        if (uvfac[1] == ENDCAP) {
@@ -40,7 +40,7 @@ void main()
        else {
                text_color = texture2D(myTexture, mTexCoord);
        }
-       
+
        /* texture */
        if (color_type == GPENCIL_COLOR_TEXTURE) {
                fragColor =  text_color;
index 3c6768d..62740f3 100644 (file)
@@ -48,7 +48,7 @@ void main(void)
        }
        /* for solid override color */
        if (shading_type[0] == OB_SOLID) {
-               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) { 
+               if ((shading_type[1] != V3D_SHADING_MATERIAL_COLOR) && (shading_type[1] != V3D_SHADING_TEXTURE_COLOR)) {
                        finalColor = wire_color;
                }
                if (viewport_xray == 1) {
index a68c170..a32fd87 100644 (file)
@@ -30,15 +30,15 @@ float linearrgb_to_srgb(float c)
 
 bool check_borders(ivec2 uv, int size)
 {
-       for (int x = -size; x <= size; x++) { 
-               for (int y = -size; y <= size; y++) { 
+       for (int x = -size; x <= size; x++) {
+               for (int y = -size; y <= size; y++) {
                        vec4 stroke_color =  texelFetch(strokeColor, ivec2(uv.x + x, uv.y + y), 0).rgba;
                        if (stroke_color.a > 0) {
                                return true;
                        }
                }
        }
-       
+
        return false;
 }
 
@@ -62,7 +62,7 @@ void main()
 
        FragColor = clamp(stroke_color, 0.0, 1.0);
        gl_FragDepth = clamp(stroke_depth, 0.0, 1.0);
-       
+
        if (do_select == 1) {
                if (stroke_color.a == 0) {
                        if (check_borders(uv, 2)) {
index a7f0d2c..3a2347d 100644 (file)
@@ -531,7 +531,7 @@ static void gp_primitive_line(tGPDprimitive *tgpi, tGPspoint *points2D)
                interp_v2_v2v2(&p2d->x, tgpi->start, tgpi->end, a);
                a += step;
        }
-       
+
        float color[4];
        UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color);
        gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL);