diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
| commit | 22a1ad61f93a4b060500e5295c58b128f24a2daf (patch) | |
| tree | 5693c7acd41e5d325cf3f6f1675cbceb232dd8a4 /source/blender/editors/object/object_transform.c | |
| parent | a115c02605b2692710f5d9b64d87407b7ca5b374 (diff) | |
| parent | 937c5494c4933c65635450e66aeacffed74939f2 (diff) | |
svn merge ^/trunk/blender -r42372:42416
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 9d8112c323a..d1e4568b1cc 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -189,15 +189,15 @@ static void object_clear_scale(Object *ob) { /* clear scale factors which are not locked */ if ((ob->protectflag & OB_LOCK_SCALEX)==0) { - ob->dsize[0]= 1.0f; + ob->dscale[0]= 1.0f; ob->size[0]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEY)==0) { - ob->dsize[1]= 1.0f; + ob->dscale[1]= 1.0f; ob->size[1]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEZ)==0) { - ob->dsize[2]= 1.0f; + ob->dscale[2]= 1.0f; ob->size[2]= 1.0f; } } |