diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-10 19:23:05 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-10 19:23:05 +0300 |
| commit | 4b6f66fa54adc5382b795de80e19fb72e05178cd (patch) | |
| tree | da92c9e228742304c039b0b4fa04d500f99f4d77 | |
| parent | f7cc0cf342c62c03c9e3ed26d93d22fa736f3ab8 (diff) | |
Cosmetic change (after bugreport), scaling in axis (press X,Y,Z) now prints
in header "local" too, this to indicate it only does local scales.
In editmesh: added NULL pointer in return of function to prevent crash
on error "give quad verts"
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editobject.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 174056f7f66..d668be755e6 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -1946,6 +1946,8 @@ if(efa1->v1== *v2) { */ } else { + *v3= *v4= NULL; + printf("error in givequadverts()\n"); return; } diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 0a24c60fd93..9244c3d1a67 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -5952,7 +5952,9 @@ void transform(int mode) sprintf(str, "Sizex: %.3f Sizey: %.3f Sizez: >%.3f<", sizelo[0], sizelo[1], sizelo[2]); } } - else + else if (axismode) + sprintf(str, "Local Sizex: %.3f Sizey: %.3f Sizez: %.3f", sizelo[0], sizelo[1], sizelo[2]); + else sprintf(str, "Sizex: %.3f Sizey: %.3f Sizez: %.3f", sizelo[0], sizelo[1], sizelo[2]); } else if (mode=='S') { |