[Bf-blender-cvs] [33a027b] master: Fix T37993: mass of Rigid Body ignores scene unit scale

Sergej Reich noreply at git.blender.org
Tue Dec 31 18:14:30 CET 2013


Commit: 33a027b3a3c524df8825c9b833a5526240ad79a4
Author: Sergej Reich
Date:   Tue Dec 31 17:58:55 2013 +0100
https://developer.blender.org/rB33a027b3a3c524df8825c9b833a5526240ad79a4

Fix T37993: mass of Rigid Body ignores scene unit scale

Mass units weren't scaled in the ui.

===================================================================

M	source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index b1c66a6..cf71e18 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);




More information about the Bf-blender-cvs mailing list