[Bf-blender-cvs] [36da85ebeb0] blender2.8: Cleanup: style

[Campbell Barton]

Commit: 36da85ebeb0821584fc478a3896834fe7d1e621c
Author: Campbell Barton
Date:   Wed Nov 28 11:18:09 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB36da85ebeb0821584fc478a3896834fe7d1e621c

Cleanup: style

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

M       source/blender/blenkernel/intern/font.c
M       source/blender/collada/SceneExporter.cpp
M       source/blender/collada/TransformWriter.cpp
M       source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
M       source/blender/draw/intern/draw_cache_impl_particles.c

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

diff --git a/source/blender/blenkernel/intern/font.c 
b/source/blender/blenkernel/intern/font.c
index 5aa0207cd88..1b6061d5b04 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1285,7 +1285,7 @@ makebreak:
                }
        }
 
-       if (ELEM(mode, FO_CURSUP, FO_CURSDOWN, FO_PAGEUP, FO_PAGEDOWN) && 
+       if (ELEM(mode, FO_CURSUP, FO_CURSDOWN, FO_PAGEUP, FO_PAGEDOWN) &&
            iter_data->status == VFONT_TO_CURVE_INIT)
        {
                ct = &chartransdata[ef->pos];
diff --git a/source/blender/collada/SceneExporter.cpp 
b/source/blender/collada/SceneExporter.cpp
index 212c2639a6e..3e375b14e44 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -137,7 +137,7 @@ void SceneExporter::writeNodes(Object *ob)
                }
                else {
                        TransformWriter::add_node_transform_ob(
-                               colladaNode, 
+                               colladaNode,
                                ob,
                                
this->export_settings->export_transformation_type,
                                this->export_settings->limit_precision
diff --git a/source/blender/collada/TransformWriter.cpp 
b/source/blender/collada/TransformWriter.cpp
index c4d24e67b05..4ff9e0af50f 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -64,7 +64,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& 
node, float mat[4][4],
 }
 
 void TransformWriter::add_node_transform_ob(
-       COLLADASW::Node& node, 
+       COLLADASW::Node& node,
        Object *ob,
        BC_export_transformation_type transformation_type,
        bool limit_precision)
diff --git 
a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl 
b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
index 877693724f9..f5696116eea 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl
@@ -73,7 +73,7 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 
blend_color)
                outcolor = mix_color * blend_opacity;;
                outcolor.a = src_color.a;
        }
-       
+
        return outcolor;
 }
 
@@ -97,7 +97,7 @@ vec4 tone(vec4 stroke_color)
        else {
                return stroke_color;
        }
-}              
+}
 
 void main()
 {
@@ -105,7 +105,7 @@ void main()
        ivec2 uv = ivec2(gl_FragCoord.xy);
        vec4 stroke_color =  texelFetch(strokeColor, uv, 0).rgba;
        float stroke_depth = texelFetch(strokeDepth, uv, 0).r;
-       
+
        vec4 mix_color =  texelFetch(blendColor, uv, 0).rgba;
        float mix_depth = texelFetch(blendDepth, uv, 0).r;
 
@@ -116,7 +116,7 @@ void main()
        if (mix_color.a > 0) {
                mix_color = vec4(vec3(mix_color.rgb / mix_color.a), 
mix_color.a);
        }
-       
+
        /* Normal mode */
        if (mode == MODE_NORMAL) {
                if (stroke_color.a > 0) {
@@ -141,7 +141,7 @@ void main()
                FragColor = tone(FragColor);
                return;
        }
-       
+
        /* if not using mask, return mix color */
        if ((stroke_color.a == 0) && (clamp_layer == OFF)) {
                FragColor = tone(mix_color);
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 5a5f0ea0b3a..d83f8fb660b 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -706,7 +706,7 @@ static float particle_key_weight(const ParticleData 
*particle, int strand, float
                int index = (int)interp;
                interp -= floorf(interp); /* Time between 2 edit key */
                float s1 = hkeys[index].weight;
-               float s2 = hkeys[index+1].weight;
+               float s2 = hkeys[index + 1].weight;
                return s1 + interp * (s2 - s1);
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs