diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-11-30 03:08:30 +0300 |
commit | 837e9dcade7e0c60d61f1917fd5a2ec29e22b364 (patch) | |
tree | cf6ea5d2a2a28146c2e673cae63338adc536e8c4 /source/blender/freestyle | |
parent | 10bf807574df6c96becd743544d19e3cda10bf66 (diff) | |
parent | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (diff) |
Merged changes to revision 25007.
The following files were according to the Math Lib reorganization
(see the commit log of revision 24464 for more information):
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
The file release/scripts/ui/properties_render.py was also updated
according the RNA UI API renaming in revision 24795.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 16 | ||||
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index f70cdaf8720..114dd1bc7e2 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -66,7 +66,7 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) // M allows to recover world coordinates from camera coordinates // M => obr->ob->imat * obr->obmat (multiplication from left to right) float M[4][4]; - Mat4MulMat4(M, obr->ob->imat, obr->ob->obmat); + mul_m4_m4m4(M, obr->ob->imat, obr->ob->obmat); // We compute a normal per vertex and manages the smoothing of the shape: // Lib3dsVector *normalL=(Lib3dsVector*)malloc(3*sizeof(Lib3dsVector)*mesh->faces); @@ -128,7 +128,7 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) pvtmp[1] = obr->vertnodes[0].vert->co[1]; pvtmp[2] = obr->vertnodes[0].vert->co[2]; - Mat4MulVecfl( M, pvtmp); + mul_m4_v3( M, pvtmp); minBBox[0] = pvtmp[0]; maxBBox[0] = pvtmp[0]; @@ -197,7 +197,7 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) //lib3ds_vector_transform(pv, M, mesh->pointL[f->points[i]].pos); //fills the cells of the pv array for(j=0; j<3; j++) pv[j] = fv[i]->co[j]; - Mat4MulVecfl( M, pv); + mul_m4_v3( M, pv); for(j=0; j<3; j++) // we parse the xyz coordinates of the vertex i { @@ -234,8 +234,8 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) vec02[2] = pv_ptr[2][2] - pv_ptr[0][2]; float n[3]; - Crossf(n, vec01, vec02); - Normalize(n); + cross_v3_v3v3(n, vec01, vec02); + normalize_v3(n); for(i=0; i<3; ++i) { for(j=0; j<3; ++j) { @@ -277,7 +277,7 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) //lib3ds_vector_transform(pv, M, mesh->pointL[f->points[i]].pos); //fills the cells of the pv array for(j=0; j<3; j++) pv[j] = fv[i]->co[j]; - Mat4MulVecfl( M, pv); + mul_m4_v3( M, pv); for(j=0; j<3; j++) // we parse the xyz coordinates of the vertex i { @@ -314,8 +314,8 @@ void BlenderFileLoader::insertShapeNode(ObjectRen *obr, int id) vec02[2] = pv_ptr[2][2] - pv_ptr[0][2]; float n[3]; - Crossf(n, vec01, vec02); - Normalize(n); + cross_v3_v3v3(n, vec01, vec02); + normalize_v3(n); for(i=0; i<3; ++i) { for(j=0; j<3; ++j) { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index e1a818b4a7f..8068eaf1bcf 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -24,7 +24,7 @@ extern "C" { #include "BKE_mesh.h" #include "BKE_scene.h" - #include "BLI_arithb.h" + #include "BLI_math.h" #ifdef __cplusplus } |