diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-12 09:53:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-12 09:53:12 +0400 |
| commit | d1085715a3b52bc31176a6accfa0b4838d99c2ab (patch) | |
| tree | df9cc7bc84c5cb31e241c78d266a9c0b05f8461b /source/blender/editors/interface | |
| parent | 23e057185370f1aaccf13f86062f3622d25e950a (diff) | |
fix for errors evaluating user input when units are disabled
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f3d181c560a..0451cd69dff 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1470,12 +1470,16 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) /* number editing */ double value; - /* XXX 2.50 missing python api */ #ifndef DISABLE_PYTHON { char str_unit_convert[256]; - - bUnit_ReplaceString(str_unit_convert, str, 1.0/ui_get_but_scale_unit(but, 1.0), U.unit_system, RNA_SUBTYPE_UNIT_VALUE(RNA_property_subtype(but->rnaprop))); + int change= -1; + if(U.unit_system != USER_UNIT_NONE) { + bUnit_ReplaceString(str_unit_convert, str, ui_get_but_scale_unit(but, 1.0), U.unit_system, RNA_SUBTYPE_UNIT_VALUE(RNA_property_subtype(but->rnaprop))); + } + else { + strcpy(str_unit_convert, str); + } if(BPY_button_eval(C, str_unit_convert, &value)) { value = ui_get_but_val(but); /* use its original value */ @@ -1832,7 +1836,7 @@ void ui_check_but(uiBut *but) else if(U.unit_system != USER_UNIT_NONE && but->rnaprop && RNA_SUBTYPE_UNIT_VALUE(RNA_property_subtype(but->rnaprop))) { char new_str[256]; - if(U.unit_scale_length==0.0) U.unit_scale_length= 1.0; // XXX do_versions + if(U.unit_scale_length<0.0001) U.unit_scale_length= 1.0; // XXX do_versions ui_get_but_string_unit(but, new_str, value, TRUE); sprintf(but->drawstr, "%s%s", but->str, new_str); |