[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29150] trunk/blender/source/blender: 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 .
Campbell Barton
ideasman42 at gmail.com
Wed Jun 2 09:40:50 CEST 2010
Revision: 29150
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29150
Author: campbellbarton
Date: 2010-06-02 09:40:50 +0200 (Wed, 02 Jun 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2010-06-02 07:06:47 UTC (rev 29149)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2010-06-02 07:40:50 UTC (rev 29150)
@@ -1669,9 +1669,9 @@
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 @@
unit_m4(mat);
unit_m4(mat1);
- rotate_m4(mat,'z',-twist);
+ rotate_m4(mat, 'Z', -twist);
dx = px - vx;
dy = py - vy;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-06-02 07:06:47 UTC (rev 29149)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-06-02 07:40:50 UTC (rev 29150)
@@ -137,7 +137,7 @@
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 @@
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 @@
}
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);
More information about the Bf-blender-cvs
mailing list