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:
authorJacques Lucke <jacques@blender.org>2020-09-09 19:41:07 +0300
committerJacques Lucke <jacques@blender.org>2020-09-09 19:41:07 +0300
commit63916f5941b443dfc8566682bb75374e5abd553f (patch)
treefb0704701f1d4d9acbddf4a6fbc62c819d8d4c36 /source/blender/editors/interface/interface_widgets.c
parent0cff2c944f9c2cd3ac873fe826c4399fc2f32159 (diff)
Cleanup: reduce variable scope
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index ab0f6d90caa..0cbb8f268a2 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -5002,12 +5002,7 @@ static void draw_disk_shaded(float start,
bool shaded)
{
const float radius_ext_scale = (0.5f / radius_ext); /* 1 / (2 * radius_ext) */
- int i;
- float s, c;
- float y1, y2;
- float fac;
- uchar r_col[4];
uint pos, col;
GPUVertFormat *format = immVertexFormat();
@@ -5022,24 +5017,24 @@ static void draw_disk_shaded(float start,
}
immBegin(GPU_PRIM_TRI_STRIP, subd * 2);
- for (i = 0; i < subd; i++) {
- float a;
-
- a = start + ((i) / (float)(subd - 1)) * angle;
- s = sinf(a);
- c = cosf(a);
- y1 = s * radius_int;
- y2 = s * radius_ext;
+ for (int i = 0; i < subd; i++) {
+ float a = start + ((i) / (float)(subd - 1)) * angle;
+ float s = sinf(a);
+ float c = cosf(a);
+ float y1 = s * radius_int;
+ float y2 = s * radius_ext;
if (shaded) {
- fac = (y1 + radius_ext) * radius_ext_scale;
+ uchar r_col[4];
+ float fac = (y1 + radius_ext) * radius_ext_scale;
color_blend_v4_v4v4(r_col, col1, col2, fac);
immAttr4ubv(col, r_col);
}
immVertex2f(pos, c * radius_int, s * radius_int);
if (shaded) {
- fac = (y2 + radius_ext) * radius_ext_scale;
+ uchar r_col[4];
+ float fac = (y2 + radius_ext) * radius_ext_scale;
color_blend_v4_v4v4(r_col, col1, col2, fac);
immAttr4ubv(col, r_col);
}