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>2021-07-30 09:19:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-30 09:19:19 +0300
commit93eb460dd0aca4de33bf780de76eee319c224bae (patch)
tree8ee44df80044964ee00bb1217d00623fd928d891 /source/blender/editors/interface/interface_draw.c
parentf81a6a2ff1dc34bbffd6ed34cfc49646e1bfc5f9 (diff)
Cleanup: clang-format (re-run after v12 version bump)
Diffstat (limited to 'source/blender/editors/interface/interface_draw.c')
-rw-r--r--source/blender/editors/interface/interface_draw.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 655fdda3069..65104885d98 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -106,14 +106,30 @@ void UI_draw_roundbox_4fv_ex(const rctf *rect,
.color_inner1[1] = inner1 ? inner1[1] : 0.0f,
.color_inner1[2] = inner1 ? inner1[2] : 0.0f,
.color_inner1[3] = inner1 ? inner1[3] : 0.0f,
- .color_inner2[0] = inner2 ? inner2[0] : inner1 ? inner1[0] : 0.0f,
- .color_inner2[1] = inner2 ? inner2[1] : inner1 ? inner1[1] : 0.0f,
- .color_inner2[2] = inner2 ? inner2[2] : inner1 ? inner1[2] : 0.0f,
- .color_inner2[3] = inner2 ? inner2[3] : inner1 ? inner1[3] : 0.0f,
- .color_outline[0] = outline ? outline[0] : inner1 ? inner1[0] : 0.0f,
- .color_outline[1] = outline ? outline[1] : inner1 ? inner1[1] : 0.0f,
- .color_outline[2] = outline ? outline[2] : inner1 ? inner1[2] : 0.0f,
- .color_outline[3] = outline ? outline[3] : inner1 ? inner1[3] : 0.0f,
+ .color_inner2[0] = inner2 ? inner2[0] :
+ inner1 ? inner1[0] :
+ 0.0f,
+ .color_inner2[1] = inner2 ? inner2[1] :
+ inner1 ? inner1[1] :
+ 0.0f,
+ .color_inner2[2] = inner2 ? inner2[2] :
+ inner1 ? inner1[2] :
+ 0.0f,
+ .color_inner2[3] = inner2 ? inner2[3] :
+ inner1 ? inner1[3] :
+ 0.0f,
+ .color_outline[0] = outline ? outline[0] :
+ inner1 ? inner1[0] :
+ 0.0f,
+ .color_outline[1] = outline ? outline[1] :
+ inner1 ? inner1[1] :
+ 0.0f,
+ .color_outline[2] = outline ? outline[2] :
+ inner1 ? inner1[2] :
+ 0.0f,
+ .color_outline[3] = outline ? outline[3] :
+ inner1 ? inner1[3] :
+ 0.0f,
.shade_dir = shade_dir,
.alpha_discard = 1.0f,
};