[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17596] branches/blender2.5/blender/source /blender: Bugfix: loading a .blend (via commandline now) while current config

[Ton Roosendaal]

Revision: 17596
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17596
Author:   ton
Date:     2008-11-27 18:58:46 +0100 (Thu, 27 Nov 2008)

Log Message:
-----------
Bugfix: loading a .blend (via commandline now) while current config
had more windows, it left the non-active windows empty. The window-match
code is unfinished (need to bring all editors back), for now it just
follows rule to copy active screen in loaded file to other windows.

Also: added time marker icons (wrong location, view2d stuff still)
Also: bug in random green/purple area code, stopped at 10 subwindows :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/area.c
    branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2008-11-27 17:03:47 UTC (rev 17595)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2008-11-27 17:58:46 UTC (rev 17596)
@@ -148,6 +148,8 @@
 	else {
 		float fac= 0.1*ar->swinid;
 		
+		fac= fac - (int)fac;
+		
 		glClearColor(0.5, fac, 1.0f-fac, 0.0); 
 		glClear(GL_COLOR_BUFFER_BIT);
 		

Modified: branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c	2008-11-27 17:03:47 UTC (rev 17595)
+++ branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c	2008-11-27 17:58:46 UTC (rev 17596)
@@ -50,6 +50,7 @@
 #include "BIF_glutil.h"
 
 #include "UI_interface.h"
+#include "UI_interface_icons.h"
 #include "UI_view2d.h"
 #include "UI_resources.h"
 
@@ -104,9 +105,7 @@
 		ICON_MARKER;
 	}
 	
-	//BIF_icon_draw(xpos*xscale-5.0, 12.0, icon_id);
-	glColor3ub(0, 100, 0);
-	glRectf(xpos*xscale-5.0f, 12.0f, xpos*xscale, 17.0f);
+	UI_icon_draw(xpos*xscale-5.0, 12.0, icon_id);
 	
 	glBlendFunc(GL_ONE, GL_ZERO);
 	glDisable(GL_BLEND);

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2008-11-27 17:03:47 UTC (rev 17595)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c	2008-11-27 17:58:46 UTC (rev 17596)
@@ -75,6 +75,8 @@
 #include "BLO_writefile.h"
 
 #include "ED_datafiles.h"
+#include "ED_screen.h"
+
 #include "UI_interface.h"
 
 // XXX #include "BPY_extern.h"
@@ -406,9 +408,10 @@
 			for(wm= wmlist->first; wm; wm= wm->id.next) {
 				for(win= wm->windows.first; win; win= win->next) {
 					win->screen= (bScreen *)find_id("SR", win->screenname);
+
 					if(win->screen==NULL)
-						win->screen= C->screen; /* active screen */
-
+						win->screen= ED_screen_duplicate(win, C->screen); /* active screen */
+							
 					if(win->screen->winid==0)
 						win->screen->winid= win->winid;
 				}