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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-09-18 13:54:56 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-09-18 13:54:56 +0300
commit4c1ee477070083f12bf802e551b14179e0c4579a (patch)
treed4b34ab42495a5ba76804c940cc9876cbaca8b44 /source/blender/editors/interface
parent9068c0743e0840cea5bbf07cd1bad7d662ab5a07 (diff)
parentc622533fa01a9f478d5116ca68ad299081ae22b4 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 2e6d6984c70..1ce5b08c522 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2485,7 +2485,9 @@ bool ui_but_string_set(bContext *C, uiBut *but, const char *str)
return false;
}
- if (!ui_but_is_float(but)) value = (int)floor(value + 0.5);
+ if (!ui_but_is_float(but)) {
+ value = floor(value + 0.5);
+ }
/* not that we use hard limits here */
if (value < (double)but->hardmin) value = but->hardmin;