griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Campbell Barton
2010-06-02 07:40:50 +00:00
parent 0b02fc45b3
commit 402a26e79f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/intern/math_geom.c
View File

@@ -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;

6
source/blender/modifiers/intern/MOD_screw.c
View File

@@ -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);