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:
authorCampbell Barton <ideasman42@gmail.com>2010-02-03 02:03:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-03 02:03:56 +0300
commitfc123a40d3afd699005cd90d46cf205a200a79fb (patch)
tree577e358e52a3f9513eac949f255f1a1e648203e1 /source/blender/editors/interface/interface.c
parent95bfbd470eeb1ccb3f69b5ba63875772860acdbf (diff)
patch [#20889] Support "unit"s for FloatProperty
from Martin Bürbaum (pontiac) (with own minor changes)
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r--source/blender/editors/interface/interface.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 7d9d78f5b20..40efabda061 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1429,6 +1429,12 @@ static double ui_get_but_scale_unit(uiBut *but, double value)
if(subtype == PROP_UNIT_LENGTH) {
return value * scene->unit.scale_length;
}
+ else if(subtype == PROP_UNIT_AREA) {
+ return value * pow(scene->unit.scale_length, 2);
+ }
+ else if(subtype == PROP_UNIT_VOLUME) {
+ return value * pow(scene->unit.scale_length, 3);
+ }
else if(subtype == PROP_UNIT_TIME) { /* WARNING - using evil_C :| */
return FRA2TIME(value);
}