Cleanup work for 2.5 branch. Target is to get it compile and link

still! 

4 files changed, 14 insertions, 43 deletions

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index f09c1103922..0935a7161b0 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -83,7 +83,6 @@
 #include "BLO_readfile.h" 
 #include "BLO_writefile.h" 
 
-#include "BKE_bad_level_calls.h" // for freeAllRad editNurb free_editMesh free_editText free_editArmature
 #include "BKE_utildefines.h" // O_BINARY FALSE
 #include "BIF_mainqueue.h" // mainqenter for onload script
 #include "mydevice.h"
@@ -238,21 +237,19 @@ void initglobals(void)
 
 static void clear_global(void) 
 {
-	extern short winqueue_break;	/* screen.c */
+//	extern short winqueue_break;	/* screen.c */
 
-	freeAllRad();
+// XXX	freeAllRad();
 	fastshade_free_render();	/* lamps hang otherwise */
 	free_main(G.main);			/* free all lib data */
-
-	/* force all queues to be left */
-	winqueue_break= 1;
 	
 	if (G.obedit) {
-		freeNurblist(&editNurb);
-		free_editMesh(G.editMesh);
-		free_editText();
-		free_editArmature();
+//		freeNurblist(&editNurb);
+//		free_editMesh(G.editMesh);
+//		free_editText();
+//		free_editArmature();
 	}
+//	free_vertexpaint();
 
 	G.curscreen= NULL;
 	G.scene= NULL;
@@ -267,8 +264,6 @@ static void clear_global(void)
 	G.sima= NULL;
 	G.sipo= NULL;
 	
-	free_vertexpaint();
-	
 	G.f &= ~(G_WEIGHTPAINT + G_VERTEXPAINT + G_FACESELECT + G_PARTICLEEDIT);
 }
 
@@ -452,9 +447,6 @@ int BKE_read_file(bContext *C, char *dir, void *unused)
 	BlendFileData *bfd;
 	int retval= 1;
 	
-	if (!G.background)
-		waitcursor(1);
-		
 	bfd= BLO_read_from_file(dir, &bre);
 	if (bfd) {
 		if(bfd->user) retval= 2;
@@ -466,10 +458,7 @@ int BKE_read_file(bContext *C, char *dir, void *unused)
 	else {
 		error("Loading %s failed: %s", dir, BLO_bre_as_string(bre));
 	}
-	
-	if (!G.background)
-		waitcursor(0);
-	
+		
 	return (bfd?retval:0);
 }
 
@@ -477,20 +466,14 @@ int BKE_read_file_from_memory(bContext *C, char* filebuf, int filelength, void *
 {
 	BlendReadError bre;
 	BlendFileData *bfd;
-	
-	if (!G.background)
-		waitcursor(1);
-		
+			
 	bfd= BLO_read_from_memory(filebuf, filelength, &bre);
 	if (bfd) {		
 		setup_app_data(C, bfd, "<memory>");
 	} else {
 		error("Loading failed: %s", BLO_bre_as_string(bre));
 	}
-	
-	if (!G.background)
-		waitcursor(0);
-	
+		
 	return (bfd?1:0);
 }
 
@@ -500,19 +483,13 @@ int BKE_read_file_from_memfile(bContext *C, MemFile *memfile)
 	BlendReadError bre;
 	BlendFileData *bfd;
 	
-	if (!G.background)
-		waitcursor(1);
-		
 	bfd= BLO_read_from_memfile(G.sce, memfile, &bre);
 	if (bfd) {
 		setup_app_data(C, bfd, "<memory>");
 	} else {
 		error("Loading failed: %s", BLO_bre_as_string(bre));
 	}
-	
-	if (!G.background)
-		waitcursor(0);
-	
+		
 	return (bfd?1:0);
 }
 
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 0f1f8c6078a..3b6aa3bc1eb 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -2255,7 +2255,7 @@ static void displist_to_objects(ListBase *lbase)
 	/* irst this: is still active */
 	if(ivsurf) {
 		where_is_object(ivsurf);
-		docenter_new();
+// XXX		docenter_new();
 	}
 
 	dl= lbase->first;
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index f368a30afb3..7dab2e51993 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -193,7 +193,7 @@ bSensor *new_sensor(int type)
 	init_sensor(sens);
 	
 	strcpy(sens->name, "sensor");
-	make_unique_prop_names(sens->name);
+// XXX	make_unique_prop_names(sens->name);
 	
 	return sens;
 }
diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c
index b99c2c51441..fda5cf89298 100644
--- a/source/blender/blenkernel/intern/script.c
+++ b/source/blender/blenkernel/intern/script.c
@@ -38,9 +38,8 @@
 #include "BPI_script.h"
 
 #include "MEM_guardedalloc.h"
-#include "BKE_bad_level_calls.h" /* for BPY_clear_script */
 
-/*
+
 #include "BLI_blenlib.h"
 #include "BKE_utildefines.h"
 #include "BKE_library.h"
@@ -49,11 +48,6 @@
 
 #include "BPY_extern.h" // Blender Python library
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-*/
-
 /* 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). */