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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-25 15:52:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-25 15:52:42 +0400
commitf5ed60016ca68c4a4e0b8cabcdac48c8029fd62b (patch)
tree1c8dcbcd3337ba64089c91cb4afdf9adbdb43f96 /source
parentdd00e1f4c636d373e0b3c50aebd890c59ea91daf (diff)
fix [#27139] Value Slider, some colours are two coloured
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_widgets.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 90a83009c4d..09e4b153d98 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -575,19 +575,17 @@ static void shadecolors4(char *coltop, char *coldown, const char *color, short s
coldown[3]= color[3];
}
-static void round_box_shade_col4(const char *col1, const char *col2, float fac)
+static void round_box_shade_col4(const char col1[4], const char col2[4], const float fac)
{
- int faci, facm;
unsigned char col[4];
-
- faci= floor(255.1f*fac);
- facm= 255-faci;
-
+ const int faci= FTOCHAR(fac);
+ const int facm= 255-faci;
+
col[0]= (faci*col1[0] + facm*col2[0])>>8;
col[1]= (faci*col1[1] + facm*col2[1])>>8;
col[2]= (faci*col1[2] + facm*col2[2])>>8;
col[3]= (faci*col1[3] + facm*col2[3])>>8;
-
+
glColor4ubv(col);
}
@@ -2316,7 +2314,7 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s
double value;
float offs, toffs, fac;
char outline[3];
-
+
widget_init(&wtb);
widget_init(&wtb1);