2.5

Think global, act local!

The old favorite G.scene gone! Man... that took almost 2 days.
Also removed G.curscreen and G.edbo.

Not everything could get solved; here's some notes.
- modifiers now store current scene in ModifierData. This is not
  meant for permanent, but it can probably stick there until we
  cleaned the anim system and depsgraph to cope better with
  timing issues.
- Game engine G.scene should become an argument for staring it.
  Didn't solve this yet.
- Texture nodes should get scene cfra, but the current implementation
  is too tightly wrapped to do it easily.

4 files changed, 5 insertions, 115 deletions

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index d9e3a6daf99..f9f73e8d31d 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -70,10 +70,6 @@
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 
-#ifdef WITH_VERSE
-#include "BKE_verse.h"
-#endif
-
 #include "BLO_readfile.h"
 #include "BLO_writefile.h"
 
@@ -360,17 +356,6 @@ static void init_userdef_themes(void)
 	/* this timer uses U */
 // XXX	reset_autosave();
 
-#ifdef WITH_VERSE
-	if(strlen(U.versemaster)<1) {
-		strcpy(U.versemaster, "master.uni-verse.org");
-	}
-	if(strlen(U.verseuser)<1) {
-// XXX		char *name = verse_client_name();
-// XXX		strcpy(U.verseuser, name);
-// XXX		MEM_freeN(name);
-	}
-#endif
-
 }
 
 /* To be able to read files without windows closing, opening, moving 
@@ -473,47 +458,14 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist)
 	}
 }
 
-#ifdef WITH_VERSE
-static void verse_unsub(void)
-{
-	extern ListBase session_list;
-	struct VerseSession *session;
-	struct VNode *vnode;
-	
-	session = session_list.first;
-	while(session) {
-		vnode = session->nodes.lb.first;
-		while(vnode) {
-			switch(vnode->type) {
-				case V_NT_OBJECT:
-//XXX					unsubscribe_from_obj_node(vnode);
-					break;
-				case V_NT_GEOMETRY:
-//XXX					unsubscribe_from_geom_node(vnode);
-					break;
-				case V_NT_BITMAP:
-//XXX					unsubscribe_from_bitmap_node(vnode);
-					break;
-			}
-			vnode = vnode->next;
-		}
-		session = session->next;
-	}
-}
-#endif
-
 void WM_read_file(bContext *C, char *name, ReportList *reports)
 {
 	int retval;
 
-#ifdef WITH_VERSE
-	verse_unsub();		/* bad call here (ton) */
-#endif
-	
 	/* first try to append data from exotic file formats... */
 	/* it throws error box when file doesnt exist and returns -1 */
 	/* note; it should set some error message somewhere... (ton) */
-	retval= BKE_read_exotic(name);
+	retval= BKE_read_exotic(CTX_data_scene(C), name);
 	
 	/* we didn't succeed, now try to read Blender file */
 	if (retval== 0) {
@@ -552,26 +504,6 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
 	}
 }
 
-static void outliner_242_patch(void)
-{
-	ScrArea *sa;
-	
-// XXX	
-	if(G.curscreen==NULL) return;
-	for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
-		SpaceLink *sl= sa->spacedata.first;
-		for(; sl; sl= sl->next) {
-			if(sl->spacetype==SPACE_OOPS) {
-				SpaceOops *soops= (SpaceOops *)sl;
-				if(soops->type!=SO_OUTLINER) {
-					soops->type= SO_OUTLINER;
-// XXX					init_v2d_oops(sa, soops);
-				}
-			}
-		}
-	}
-	G.fileflags |= G_FILE_GAME_MAT;
-}
 
 /* called on startup,  (context entirely filled with NULLs) */
 /* or called for 'Erase All' */
@@ -600,8 +532,6 @@ int WM_read_homefile(bContext *C, int from_memory)
 		success = BKE_read_file(C, tstr, NULL, NULL);
 	} else {
 		success = BKE_read_file_from_memory(C, datatoc_B_blend, datatoc_B_blend_size, NULL, NULL);
-		/* outliner patch for 2.42 .b.blend */
-		outliner_242_patch();
 	}
 	
 	/* match the read WM with current WM */
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 8eca5850628..65df71a067a 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -195,6 +195,9 @@ void WM_exit(bContext *C)
 	if(C)
 		ED_editors_exit(C);
 	
+	/* Context should still working here. but radio tool needs cleaning... */
+	freeAllRad(CTX_data_scene(C));
+	
 	free_ttfont(); /* bke_font.h */
 	
 #ifdef WITH_VERSE
@@ -202,7 +205,6 @@ void WM_exit(bContext *C)
 #endif
 	free_openrecent();
 	
-	freeAllRad();
 	BKE_freecubetable();
 	
 //	if (G.background == 0)
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 29baf9f4cc5..8431317f4d9 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -490,46 +490,3 @@ static int is_a_really_crappy_nvidia_card(void) {
 }
 #endif
 
-void myswapbuffers(void)	/* XXX */
-{
-	ScrArea *sa;
-	
-	sa= G.curscreen->areabase.first;
-	while(sa) {
-//		if(sa->win_swap==WIN_BACK_OK) sa->win_swap= WIN_FRONT_OK;
-//		if(sa->head_swap==WIN_BACK_OK) sa->head_swap= WIN_FRONT_OK;
-		
-		sa= sa->next;
-	}
-
-	/* HACK, some windows drivers feel they should honor the scissor
-	 * test when swapping buffers, disable the test while swapping
-	 * on WIN32. (namely Matrox and NVidia's new drivers around Oct 1 2001)
-	 * - zr
-	 */
-
-#ifdef WIN32
-		/* HACK, in some NVidia driver release some kind of
-		 * fancy optimiziation (I presume) was put in which for
-		 * some reason causes parts of the buffer not to be
-		 * swapped. One way to defeat it is the following wierd
-		 * code (which we only do for nvidia cards). This should
-		 * be removed if NVidia fixes their drivers. - zr
-		 */
-	if (is_a_really_crappy_nvidia_card()) {
-		glDrawBuffer(GL_FRONT);
-
-		glBegin(GL_LINES);
-		glEnd();
-
-		glDrawBuffer(GL_BACK);
-	}
-
-	glDisable(GL_SCISSOR_TEST);
-//	window_swap_buffers(winlay_mainwindow);
-	glEnable(GL_SCISSOR_TEST);
-#else
-//	window_swap_buffers(winlay_mainwindow);
-#endif
-}
-
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 93b5bf02e71..6a8174b351a 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -75,6 +75,7 @@
 #define TIMER0			0x0111	/* timer event, slot for internal use */
 #define TIMER1			0x0112	/* timer event, slot for internal use */
 #define TIMER2			0x0113	/* timer event, slot for internal use */
+#define TIMER3			0x0114	/* timer event, slot for internal use */
 
 /* standard keyboard */