From 33a027b3a3c524df8825c9b833a5526240ad79a4 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Tue, 31 Dec 2013 17:58:55 +0100 Subject: Fix T37993: mass of Rigid Body ignores scene unit scale Mass units weren't scaled in the ui. --- source/blender/editors/interface/interface.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors/interface/interface.c') 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); -- cgit v1.2.3