Revision: 24466
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24466
Author: blendix
Date: 2009-11-10 21:50:34 +0100 (Tue, 10 Nov 2009)
Log Message:
-----------
Math Lib
* Post-conversion commit, fixing some introduced warnings.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2009-11-10
20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2009-11-10
20:50:34 UTC (rev 24466)
@@ -706,7 +706,7 @@
if(par->transflag &
OB_DUPLIFACES_SCALE) {
float size= v4?
area_quad_v3(v1, v2, v3, v4): area_tri_v3(v1, v2, v3);
size= sqrt(size) *
par->dupfacesca;
- mul_m3_fl(mat[0], size);
+ mul_m3_fl(mat, size);
}
copy_m3_m3(mat3, mat);
@@ -943,7 +943,7 @@
if(part->ren_as==PART_DRAW_GR && psys->part->draw &
PART_DRAW_WHOLE_GR) {
for(go= part->dup_group->gobject.first, b=0;
go; go= go->next, b++) {
mul_m4_m4m4(tmat, oblist[b]->obmat,
pamat);
- mul_mat3_m4_fl((float *)tmat,
size*scale);
+ mul_mat3_m4_fl(tmat, size*scale);
if(par_space_mat)
mul_m4_m4m4(mat, tmat,
par_space_mat);
else
@@ -965,7 +965,7 @@
copy_m4_m4(mat, pamat);
mul_m4_m4m4(tmat, obmat, mat);
- mul_mat3_m4_fl((float *)tmat, size*scale);
+ mul_mat3_m4_fl(tmat, size*scale);
if(part->draw & PART_DRAW_GLOBAL_OB)
VECADD(tmat[3], tmat[3], vec);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2009-11-10
20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2009-11-10
20:50:34 UTC (rev 24466)
@@ -813,7 +813,7 @@
else
copy_m3_m4(wmat, pchan->chan_mat);
- mul_m3_fl((float*)wmat, weight);
+ mul_m3_fl(wmat, weight);
add_m3_m3m3(mat, mat, wmat);
}
@@ -1013,7 +1013,7 @@
vec= sumvec;
if(defMats) {
- zero_m3((float*)summat);
+ zero_m3(summat);
smat = summat;
}
}
@@ -1123,7 +1123,7 @@
copy_m3_m3(tmpmat, defMats[i]);
if(!use_quaternion) /* quaternion already is
scale corrected */
- mul_m3_fl((float*)smat,
armature_weight/contrib);
+ mul_m3_fl(smat,
armature_weight/contrib);
mul_serie_m3(defMats[i], tmpmat, pre, smat,
post,
NULL, NULL, NULL, NULL);
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2009-11-10
20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2009-11-10
20:50:34 UTC (rev 24466)
@@ -479,7 +479,7 @@
invert_m4_m4(tmat, mat);
copy_m3_m4(imat, tmat);
- if(ob->transflag & OB_NEG_SCALE) mul_m3_fl((float *)imat, -1.0);
+ if(ob->transflag & OB_NEG_SCALE) mul_m3_fl(imat, -1.0);
if (need_orco_r) *need_orco_r= 0;
for(a=0; a<ob->totcol; a++) {
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-11-10
20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-11-10
20:50:34 UTC (rev 24466)
@@ -3974,7 +3974,7 @@
}
unit_m4(offsetmat);
- mul_mat3_m4_fl(offsetmat[0], 0.5);
+ mul_mat3_m4_fl(offsetmat, 0.5);
offsetmat[3][0] = offsetmat[3][1] = offsetmat[3][2] = 0.5;
if (cam) {
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2009-11-10 20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2009-11-10 20:50:34 UTC (rev 24466)
@@ -1356,7 +1356,7 @@
uvCo3 = (float *)tf_other->uv[2];
}
- interp_v2_v2v2v2(uv_other, uvCo1, uvCo2, uvCo3, w);
+ interp_v2_v2v2v2(uv_other, uvCo1, uvCo2, uvCo3, (float*)w);
/* use */
uvco_to_wrapped_pxco(uv_other, ibuf_other->x, ibuf_other->y, &x, &y);
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2009-11-10 20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2009-11-10 20:50:34 UTC (rev 24466)
@@ -1582,7 +1582,7 @@
if (arm->drawtype==ARM_ENVELOPE) {
/* precalc inverse matrix for drawing screen aligned */
wmGetMatrix(smat);
- mul_mat3_m4_fl(smat[0], 1.0f/len_v3(ob->obmat[0]));
+ mul_mat3_m4_fl(smat, 1.0f/len_v3(ob->obmat[0]));
invert_m4_m4(imat, smat);
/* and draw blended distances */
@@ -1931,7 +1931,7 @@
if(arm->drawtype==ARM_ENVELOPE) {
/* precalc inverse matrix for drawing screen aligned */
wmGetMatrix(smat);
- mul_mat3_m4_fl(smat[0], 1.0f/len_v3(ob->obmat[0]));
+ mul_mat3_m4_fl(smat, 1.0f/len_v3(ob->obmat[0]));
invert_m4_m4(imat, smat);
/* and draw blended distances */
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2009-11-10 20:44:10 UTC (rev 24465)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2009-11-10 20:50:34 UTC (rev 24466)
@@ -605,8 +605,8 @@
for(k=0; k<4; k++)
rotobj[3][k] =0.0f;
- zero_m4(*rotup);
- zero_m4(*rotside);
+ zero_m4(rotup);
+ zero_m4(rotside);
/* compensate front/side.. against opengl x,y,z world definition */
/* this is "kanonen gegen spatzen", a few plus minus 1 will do here */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
