Migration of Freestyle to Blender 2.5 codebase (continued):

- proper Freestyle initialization, with support for undo/redo
- re-added FreestyleStyleConfig data structure
- Freestyle Python interpreter updated

This commit should compile without errors. More work is necessary to complete the migration:
- add Freestyle in the UI
- set up RNA support

2 files changed, 9 insertions, 10 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp
index 4dc92755ad9..f70cdaf8720 100644
--- a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/scene_graph/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];
-	MTC_Mat4MulMat4(M, obr->ob->imat, obr->ob->obmat); 
+	Mat4MulMat4(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];
 	
-	MTC_Mat4MulVecfl( M, pvtmp);
+	Mat4MulVecfl( 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];
-				MTC_Mat4MulVecfl( M, pv);
+				Mat4MulVecfl( 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];
-			MTC_cross3Float(n, vec01, vec02);
-			MTC_normalize3DF(n);
+			Crossf(n, vec01, vec02);
+			Normalize(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];
-					MTC_Mat4MulVecfl( M, pv);
+					Mat4MulVecfl( 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];
-				MTC_cross3Float(n, vec01, vec02);
-				MTC_normalize3DF(n);
+				Crossf(n, vec01, vec02);
+				Normalize(n);
 				
 				for(i=0; i<3; ++i) {
 					for(j=0; j<3; ++j) {
diff --git a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.h b/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.h
index ea5d9cb1a52..b17cde50443 100644
--- a/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/scene_graph/BlenderFileLoader.h
@@ -24,8 +24,7 @@ extern "C" {
 	
 	#include "BKE_mesh.h"
 	#include "BKE_scene.h"
-	#include "MTC_matrixops.h"
-	#include "MTC_vectorops.h"
+	#include "BLI_arithb.h"
 	
 #ifdef __cplusplus
 }