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:
authorMartin Poirier <theeth@yahoo.com>2004-11-01 00:45:00 +0300
committerMartin Poirier <theeth@yahoo.com>2004-11-01 00:45:00 +0300
commit67ed54a188419c27ca0dce8a34409b670fa3b74a (patch)
treea039b36bee9d077101521a4d6dc37b689ae19c67
parenta89a4f531c0a5516b3f1abaf03b4c0350534d8d7 (diff)
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.
-rw-r--r--source/blender/src/editobject.c18
1 files 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') {