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:
authorBastien Montagne <montagne29@wanadoo.fr>2015-05-26 14:01:29 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-05-26 14:01:29 +0300
commitd20fd2da72d9e1fbdba4306903899e5432bd4775 (patch)
treee6a6e22f142c400b83f399df2ac53f460ae993b6 /source/blender/editors/interface/interface_widgets.c
parentbfe0ea4069017c37f8b35cb5ec259bbd16c37d6a (diff)
Revert "Cleanup: set var twice"
This reverts commit eb799dc3501483ff87ec26395bf365b1fbe3dd56. I recommend reading code before doing cleanup, next time...
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index b0c09ae7cd8..c7f3d5cd7e9 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 {