diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
| commit | 9e5b28cd42a3cf87ac76e3b27b52dce08071d244 (patch) | |
| tree | eb14ff117faf3f6c524ea0a09389da313044d105 /source/blender/editors/object/object_transform.c | |
| parent | 274080025d315dc08f9291bddc6d4235ed0fc8e0 (diff) | |
| parent | c9edbab08a4854ad6e79abdfaaee65e0f9301ac0 (diff) | |
svn merge ^/trunk/blender -r42261:42290
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 b4fee991bb2..9d8112c323a 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]= 0.0f; + ob->dsize[0]= 1.0f; ob->size[0]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEY)==0) { - ob->dsize[1]= 0.0f; + ob->dsize[1]= 1.0f; ob->size[1]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEZ)==0) { - ob->dsize[2]= 0.0f; + ob->dsize[2]= 1.0f; ob->size[2]= 1.0f; } } |