[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36324] trunk/blender/source/blender/ editors/interface/interface_widgets.c: fix [#27139] Value Slider, some colours are two coloured

[Campbell Barton]

Revision: 36324
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36324
Author:   campbellbarton
Date:     2011-04-25 11:52:42 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
fix [#27139] Value Slider, some colours are two coloured

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c  
2011-04-25 10:04:07 UTC (rev 36323)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c  
2011-04-25 11:52:42 UTC (rev 36324)
@@ -575,19 +575,17 @@
        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 @@
        double value;
        float offs, toffs, fac;
        char outline[3];
-       
+
        widget_init(&wtb);
        widget_init(&wtb1);
        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs