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>2019-06-03 17:36:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-03 17:42:22 +0300
commit0efe89bdd810226f7474b90ab79d927eadf6746a (patch)
tree502cf6d81a9d91a8b8c8c7e236860eb3eac2755f /source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
parent97e53d2385cd0b72add07bff4df1f8bc660f51fb (diff)
Cleanup: style, use braces in GPU
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl18
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
index e17c5cda000..0b2bc08944e 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
@@ -199,14 +199,18 @@ vec2 do_widget(void)
/* Position to corner */
vec4 rct = (is_inner) ? recti : rect;
- if (cflag == BOTTOM_LEFT)
+ if (cflag == BOTTOM_LEFT) {
v += rct.xz;
- else if (cflag == BOTTOM_RIGHT)
+ }
+ else if (cflag == BOTTOM_RIGHT) {
v += rct.yz;
- else if (cflag == TOP_RIGHT)
+ }
+ else if (cflag == TOP_RIGHT) {
v += rct.yw;
- else /* (cflag == TOP_LEFT) */
+ }
+ else /* (cflag == TOP_LEFT) */ {
v += rct.xw;
+ }
vec2 uv = faci * (v - recti.xz);
@@ -250,10 +254,12 @@ vec2 do_tria()
bool is_tria_first = (vflag & TRIA_FIRST) != 0u;
- if (is_tria_first)
+ if (is_tria_first) {
v = v * tria1Size + tria1Center;
- else
+ }
+ else {
v = v * tria2Size + tria2Center;
+ }
return v;
}