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-04 22:39:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-04 22:39:19 +0400
commit22a1ad61f93a4b060500e5295c58b128f24a2daf (patch)
tree5693c7acd41e5d325cf3f6f1675cbceb232dd8a4 /source/blender/makesrna/intern/rna_object.c
parenta115c02605b2692710f5d9b64d87407b7ca5b374 (diff)
parent937c5494c4933c65635450e66aeacffed74939f2 (diff)
svn merge ^/trunk/blender -r42372:42416
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r--source/blender/makesrna/intern/rna_object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 8d299c5b41f..a25a039ee04 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2072,7 +2072,7 @@ static void rna_def_object(BlenderRNA *brna)
#endif
prop= RNA_def_property(srna, "delta_scale", PROP_FLOAT, PROP_XYZ);
- RNA_def_property_float_sdna(prop, NULL, "dsize");
+ RNA_def_property_float_sdna(prop, NULL, "dscale");
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");