diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-15 02:08:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-15 02:08:46 +0300 |
commit | edda93caf9ae4993cb66309c008a28245f4c3d37 (patch) | |
tree | 8f8ef506ed12e5e49bfe4055dc21a12381557928 | |
parent | 83661a5cfe2e7a50655a0c4393da5edb9851e358 (diff) |
Cleanup: clang-format
-rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl | 24 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 13 |
2 files changed, 14 insertions, 23 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 3dc1f379f71..b70a55b51fa 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_blend_frag.glsl @@ -41,10 +41,8 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 mix_color) return src_color; } - switch(mode) - { - case MODE_REGULAR: - { + switch (mode) { + case MODE_REGULAR: { /* premult */ src_color = vec4(vec3(src_color.rgb / src_color.a), src_color.a); mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a); @@ -52,8 +50,7 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 mix_color) outcolor = vec4(mix(src_color.rgb, mix_color.rgb, mix_color.a), src_color.a); break; } - case MODE_OVERLAY: - { + case MODE_OVERLAY: { src_color = vec4(vec3(src_color.rgb / src_color.a), src_color.a); mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a); @@ -64,22 +61,19 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 mix_color) outcolor.a = src_color.a; break; } - case MODE_ADD: - { + case MODE_ADD: { mix_color.rgb = mix(src_color.rgb, mix_color.rgb, mix_color.a); outcolor = src_color + mix_color; outcolor.a = src_color.a; break; } - case MODE_SUB: - { + case MODE_SUB: { mix_color.rgb = mix(src_color.rgb, mix_color.rgb, mix_color.a); outcolor = src_color - mix_color; outcolor.a = clamp(src_color.a - mix_color.a, 0.0, 1.0); break; } - case MODE_MULTIPLY: - { + case MODE_MULTIPLY: { src_color = vec4(vec3(src_color.rgb / src_color.a), src_color.a); mix_color = vec4(vec3(mix_color.rgb / mix_color.a), mix_color.a); @@ -88,15 +82,13 @@ vec4 get_blend_color(int mode, vec4 src_color, vec4 mix_color) outcolor.a = src_color.a; break; } - case MODE_DIVIDE: - { + case MODE_DIVIDE: { mix_color.rgb = mix(src_color.rgb, mix_color.rgb, mix_color.a); outcolor = src_color / mix_color; outcolor.a = src_color.a; break; } - default: - { + default: { outcolor = mix_color; outcolor.a = src_color.a; break; diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 1e8742bb368..fed56f3d452 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2810,13 +2810,12 @@ static void outliner_draw_tree_element(bContext *C, active = OL_DRAWSEL_ACTIVE; } } - else - { - active = tree_element_type_active( - C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false); - /* active collection*/ - icon_bgcolor[3] = 0.2f; - } + else { + active = tree_element_type_active( + C, scene, view_layer, soops, te, tselem, OL_SETSEL_NONE, false); + /* active collection*/ + icon_bgcolor[3] = 0.2f; + } /* Checkbox to enable collections. */ if ((tselem->type == TSE_LAYER_COLLECTION) && |