Commit: d20fd2da72d9e1fbdba4306903899e5432bd4775
Author: Bastien Montagne
Date: Tue May 26 13:01:29 2015 +0200
Branches: master
https://developer.blender.org/rBd20fd2da72d9e1fbdba4306903899e5432bd4775
Revert "Cleanup: set var twice"
This reverts commit eb799dc3501483ff87ec26395bf365b1fbe3dd56.
I recommend reading code before doing cleanup, next time...
===================================================================
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c
b/source/blender/editors/interface/interface_widgets.c
index b0c09ae..c7f3d5c 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1525,7 +1525,8 @@ static void widget_draw_text_icon(uiFontStyle *fstyle,
uiWidgetColors *wcol, uiB
float icon_size, text_size;
/* This is a bit britle, but avoids adding an
'UI_BUT_HAS_LABEL' flag to but... */
- if (icon_size_i > BLI_rcti_size_x(rect)) {
+ if(icon_size_i > BLI_rcti_size_x(rect)) {
+ icon_size = 0.8f * (float)icon_size_i;
text_size = 0.2f * (float)icon_size_i;
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
