diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-02 11:40:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-02 11:40:50 +0400 |
| commit | 402a26e79fe96d72146bc830f7d36652c78a5338 (patch) | |
| tree | baeb849736faafc6da169c5506233b65b15ea9bf | |
| parent | 0b02fc45b37f0c5d4b7633b56e683241df1c2b81 (diff) | |
quiet warnings in screw modifier, also fix bad args for lookat_m4 and polarview_m4 to rotate_m4, however these functions are not used at the moment so it didnt cause any problems.
| -rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 8 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index f973d4e894b..0a06cd10e1e 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -1669,9 +1669,9 @@ void polarview_m4(float Vm[][4],float dist, float azimuth, float incidence, floa unit_m4(Vm); translate_m4(Vm,0.0, 0.0, -dist); - rotate_m4(Vm,'z',-twist); - rotate_m4(Vm,'x',-incidence); - rotate_m4(Vm,'z',-azimuth); + rotate_m4(Vm,'Z',-twist); + rotate_m4(Vm,'X',-incidence); + rotate_m4(Vm,'Z',-azimuth); } void lookat_m4(float mat[][4],float vx, float vy, float vz, float px, float py, float pz, float twist) @@ -1682,7 +1682,7 @@ void lookat_m4(float mat[][4],float vx, float vy, float vz, float px, float py, unit_m4(mat); unit_m4(mat1); - rotate_m4(mat,'z',-twist); + rotate_m4(mat, 'Z', -twist); dx = px - vx; dy = py - vy; diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index b70f145b67b..a1deaa140db 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -137,7 +137,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, int totvert= dm->getNumVerts(dm); int totedge= dm->getNumEdges(dm); - char axis_char, close; + char axis_char= 'X', close; float angle= ltmd->angle; float screw_ofs= ltmd->screw_ofs; float axis_vec[3]= {0.0f, 0.0f, 0.0f}; @@ -177,7 +177,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, other_axis_1=0; other_axis_2=2; break; - case 2: + default: /* 2, use default to quiet warnings */ other_axis_1=0; other_axis_2=1; break; @@ -248,7 +248,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } else { /* exis char is used by i_rotate*/ - axis_char= 'X' + ltmd->axis; + axis_char += ltmd->axis; /* 'X' + axis */ /* useful to be able to use the axis vec in some cases still */ zero_v3(axis_vec); |