diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-12-31 20:58:55 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-12-31 21:10:30 +0400 |
| commit | 33a027b3a3c524df8825c9b833a5526240ad79a4 (patch) | |
| tree | 51c7f08b1fff39d99767b09eb540e4b7675bdc56 /source/blender/editors/interface/interface.c | |
| parent | aaabac069fbf1454e7c7b00a1e96783ecf1563cd (diff) | |
Fix T37993: mass of Rigid Body ignores scene unit scale
Mass units weren't scaled in the ui.
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index b1c66a65c35..cf71e18472c 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1757,6 +1757,9 @@ static double ui_get_but_scale_unit(uiBut *but, double value) else if (unit_type == PROP_UNIT_VOLUME) { return value * pow(unit->scale_length, 3); } + else if (unit_type == PROP_UNIT_MASS) { + return value * pow(unit->scale_length, 3); + } else if (unit_type == PROP_UNIT_TIME) { /* WARNING - using evil_C :| */ Scene *scene = CTX_data_scene(but->block->evil_C); return FRA2TIME(value); |