From 67ed54a188419c27ca0dce8a34409b670fa3b74a Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Sun, 31 Oct 2004 21:45:00 +0000 Subject: Bugfix for #1717 http://projects.blender.org/tracker/index.php?func=detail&aid=1717&group_id=9&atid=125 Scaling with PET with numerical input used a three axis input while it only gave access to one. Made it use and give access to only one as it should. --- source/blender/src/editobject.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 8a84e718176..ac09483f079 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -5733,10 +5733,20 @@ void transform(int mode) } else size[0]=size[1]=size[2]= (sqrt( (float)((yc-mval[1])*(yc-mval[1])+(mval[0]-xc)*(mval[0]-xc)) ))/sizefac; - if (typemode){ - if (numchange[0]) size[0] = addvec[0]; else size[0] = 1; - if (numchange[1]) size[1] = addvec[1]; else size[1] = 1; - if (numchange[2]) size[2] = addvec[2]; else size[2] = 1; + if (mode=='s') { + if (typemode){ + if (numchange[0]) size[0] = addvec[0]; else size[0] = 1; + if (numchange[1]) size[1] = addvec[1]; else size[1] = 1; + if (numchange[2]) size[2] = addvec[2]; else size[2] = 1; + } + } + else { + if (typemode){ + if (numchange[0]) + size[0] = size[1] = size[2] = addvec[0]; + else + size[0] = size[1] = size[2] = 1; + } } if(axismode && mode=='s') { -- cgit v1.2.3