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>2011-12-11 05:06:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-11 05:06:43 +0400
commit5f6ff0f41298bd1e35479dd7bf42d948aa61d44f (patch)
tree72a24204fcb6f3df13ba606be1b6e8798bb0ac7e /source/blender/makesrna/intern/rna_object.c
parent6bc55f2e4ac2c30044fad6ee8c47bb723f452179 (diff)
parent9b762a51b1e3419771afa1e14247573ec0c23432 (diff)
svn merge ^/trunk/blender -r42550:42564
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r--source/blender/makesrna/intern/rna_object.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index a25a039ee04..650395fdc26 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2073,6 +2073,8 @@ static void rna_def_object(BlenderRNA *brna)
prop= RNA_def_property(srna, "delta_scale", PROP_FLOAT, PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "dscale");
+ RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3);
+ RNA_def_property_float_array_default(prop, default_scale);
RNA_def_property_ui_text(prop, "Delta Scale", "Extra scaling added to the scale of the object");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update");