removed some more header files, made the game engine compile with removed header files, added includes to SConstruct files.

11 files changed, 32 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 9d51fc645ba..c57daa92484 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -87,7 +87,7 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#include "multires.h"
+//XXX #include "multires.h"
 
 // headers for fluidsim bobj meshes
 #include <stdlib.h>
@@ -2580,18 +2580,18 @@ float *multires_render_pin(Object *ob, Mesh *me, int *orig_lvl)
 		int i;
 		
 		/* Make sure all mesh edits are properly stored in the multires data*/
-		multires_update_levels(me, 1);
+		//XXX multires_update_levels(me, 1);
 	
 		/* Copy the highest level of multires verts */
 		*orig_lvl= me->mr->current;
-		lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+		//XXX lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
 		vert_copy= MEM_callocN(sizeof(float)*3*lvl->totvert, "multires vert_copy");
 		for(i=0; i<lvl->totvert; ++i)
 			VecCopyf(&vert_copy[i*3], me->mr->verts[i].co);
 	
 		/* Goto the pin level for multires */
 		me->mr->newlvl= me->mr->pinlvl;
-		multires_set_level(ob, me, 1);
+		//XXX multires_set_level(ob, me, 1);
 	}
 	
 	return vert_copy;
@@ -2604,7 +2604,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 	if(me->mr) {
 		if((*dm)->getNumVerts(*dm) == me->totvert &&
 		   (*dm)->getNumFaces(*dm) == me->totface) {
-			MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+			//XXX MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
 			DerivedMesh *old= NULL;
 			int i;
 
@@ -2612,7 +2612,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 			(*dm)->release(*dm);
 
 			me->mr->newlvl= me->mr->renderlvl;
-			multires_set_level(ob, me, 1);
+			//XXX multires_set_level(ob, me, 1);
 			(*dm)= getMeshDerivedMesh(me, ob, NULL);
 
 			/* Some of the data in dm is referenced externally, so make a copy */
@@ -2625,16 +2625,16 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 
 			/* Restore the original verts */
 			me->mr->newlvl= BLI_countlist(&me->mr->levels);
-			multires_set_level(ob, me, 1);
-			for(i=0; i<lvl->totvert; ++i)
-				VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
+			//XXX multires_set_level(ob, me, 1);
+			//XXX for(i=0; i<lvl->totvert; ++i)
+			//XXX 	VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
 		}
 		
 		if(vert_copy)
 			MEM_freeN(vert_copy);
 			
 		me->mr->newlvl= orig_lvl;
-		multires_set_level(ob, me, 1);
+		//XXX multires_set_level(ob, me, 1);
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 129e9cd3f4f..32b07fbc111 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -66,7 +66,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 /* *********************** NOTE ON POSE AND ACTION **********************
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index dc5ea96b58a..491964e7359 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include "MEM_guardedalloc.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 69cd82fced7..416402eb640 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 #include "MEM_guardedalloc.h"
-#include "nla.h"
+//XXX #include "nla.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index f649dc9690f..1b5df77c062 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -2107,6 +2107,6 @@ void build_particle_system(Object *ob)
 
 	disable_speed_curve(0);
 	
-	if(waitcursor_set) waitcursor(0);
+	//XXX if(waitcursor_set) waitcursor(0);
 }
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 5976f7846f2..b16c03b7d92 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -114,7 +114,7 @@
 #include "BKE_idprop.h"
 #include "BKE_particle.h"
 
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
 
 #define MAX_IDPUP		60	/* was 24 */
 
@@ -347,7 +347,7 @@ static ID *alloc_libblock_notest(short type)
 			id= MEM_callocN(sizeof(Text), "text");
 			break;
 		case ID_SCRIPT:
-			id= MEM_callocN(sizeof(Script), "script");
+			//XXX id= MEM_callocN(sizeof(Script), "script");
 			break;
 		case ID_SO:
 			id= MEM_callocN(sizeof(bSound), "sound");
@@ -504,7 +504,7 @@ void free_libblock(ListBase *lb, void *idv)
 			free_text((Text *)id);
 			break;
 		case ID_SCRIPT:
-			free_script((Script *)id);
+			//XXX free_script((Script *)id);
 			break;
 		case ID_SO:
 			sound_free_sound((bSound *)id);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 811b6d39f47..9b9e94774bc 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -93,7 +93,7 @@
 #include "BKE_utildefines.h"
 #include "depsgraph_private.h"
 
-#include "LOD_DependKludge.h"
+//XXX #include "LOD_DependKludge.h"
 #include "LOD_decimation.h"
 
 #include "CCGSubSurf.h"
@@ -3318,6 +3318,8 @@ static void decimateModifier_copyData(ModifierData *md, ModifierData *target)
 	tdmd->percent = dmd->percent;
 }
 
+//XXX
+#if 0 
 static DerivedMesh *decimateModifier_applyModifier(
                  ModifierData *md, Object *ob, DerivedMesh *derivedData,
                  int useRenderParams, int isFinalCalc)
@@ -3436,6 +3438,7 @@ static DerivedMesh *decimateModifier_applyModifier(
 exit:
 	return result;
 }
+#endif
 
 /* Smooth */
 
@@ -6385,7 +6388,7 @@ static void meshdeformModifier_do(
 
 	/* bind weights if needed */
 	if(!mmd->bindcos)
-		harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
+		//XXX harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
 
 	/* verify we have compatible weights */
 	totvert= numVerts;
@@ -6677,7 +6680,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->flags = eModifierTypeFlag_AcceptsMesh;
 		mti->initData = decimateModifier_initData;
 		mti->copyData = decimateModifier_copyData;
-		mti->applyModifier = decimateModifier_applyModifier;
+		//XXX mti->applyModifier = decimateModifier_applyModifier;
 
 		mti = INIT_TYPE(Smooth);
 		mti->type = eModifierTypeType_OnlyDeform;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index b57a5f465c0..a3c1d9ef19d 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -44,7 +44,7 @@
 #include "BKE_global.h"
 #include "BKE_multires.h"
 
-#include "editmesh.h"
+//XXX #include "editmesh.h"
 
 #include <math.h>
 
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index fce43aba6bc..4e0897589d2 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -53,7 +53,7 @@
 #include "BKE_blender.h"
 #include "BKE_sca.h"
 
-#include "mydevice.h"
+//#include "wm_event_types.h"
 
 void free_text_controllers(Text *txt)
 {
@@ -155,7 +155,7 @@ void init_sensor(bSensor *sens)
 		break;
 	case SENS_MOUSE:
 		ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
-		ms->type= LEFTMOUSE;
+		//XXX ms->type= LEFTMOUSE;
 		break;
 	case SENS_COLLISION:
 		sens->data= MEM_callocN(sizeof(bCollisionSensor), "colsens");
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b19e2f4f0be..aae3b9f140f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -86,7 +86,7 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
-#include "nla.h"
+//XXX #include "nla.h"
 
 #ifdef WIN32
 #else
diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c
index fda5cf89298..deb9229c63e 100644
--- a/source/blender/blenkernel/intern/script.c
+++ b/source/blender/blenkernel/intern/script.c
@@ -35,7 +35,7 @@
  */
 
 #include "BKE_script.h"
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -51,6 +51,9 @@
 /* XXX this function and so also the file should not be needed anymore,
  * since we have to force clearing all Python related data before freeing
  * Blender's library. Still testing, will decide later (Willian). */
+
+//XXX 
+#if 0
 void free_script (Script *script)
 {
 	if (!script) return;
@@ -63,3 +66,4 @@ void free_script (Script *script)
 
 	return;
 }
+#endif