Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-28 03:18:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-28 03:24:45 +0300
commit36da85ebeb0821584fc478a3896834fe7d1e621c (patch)
treefcf71a88b1eae519fd6d8d1dbe09b011d1270013 /source/blender/draw
parent37b882982af6dfd8a235e5816431e4fb76e1ba9a (diff)
Cleanup: style
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl10
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c2
2 files changed, 6 insertions, 6 deletions
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);
}
}