diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
| commit | 7b2101ace983cc9d7112dd45a8b264b51657dea9 (patch) | |
| tree | c1d75f2ae3f30fe9de51c1c7332e862064a93193 /source/blender/editors/interface/interface_templates.c | |
| parent | 787ea5feb4a80babccd86689b066153ac57db91c (diff) | |
| parent | a87c5eb52cd4951b138f518bf12d498bc5e5eb8a (diff) | |
svn merge ^/trunk/blender -r43482:43524
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 730254bba79..c8361f56fee 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2626,9 +2626,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C) uiBlockBeginAlign(block); but= uiDefBut(block, ROUNDBOX, 0, "", 0, 0, UI_UNIT_X+10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, ""); /* set the report's bg color in but->col - ROUNDBOX feature */ - but->col[0]= FTOCHAR(rti->col[0]); - but->col[1]= FTOCHAR(rti->col[1]); - but->col[2]= FTOCHAR(rti->col[2]); + rgb_float_to_uchar(but->col, rti->col); but->col[3]= 255; but= uiDefBut(block, ROUNDBOX, 0, "", UI_UNIT_X+10, 0, UI_UNIT_X+width, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, ""); |