[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17915] branches/blender2.5/blender/source /blender/editors/screen: 2.5: Fix crash moving area to fullscreen with tooltips.

Brecht Van Lommel brecht at blender.org
Thu Dec 18 02:48:25 CET 2008


Revision: 17915
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17915
Author:   blendix
Date:     2008-12-18 02:48:24 +0100 (Thu, 18 Dec 2008)

Log Message:
-----------
2.5: Fix crash moving area to fullscreen with tooltips. Happened
because C->window->screen and C->screen were different, now made
sure they are set at the same time.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-17 22:52:13 UTC (rev 17914)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c	2008-12-18 01:48:24 UTC (rev 17915)
@@ -406,8 +406,6 @@
 	sc->scene= G.scene;
 	sc->do_refresh= 1;
 	
-	win->screen= sc;
-	
 	sv1= screen_addvert(sc, 0, 0);
 	sv2= screen_addvert(sc, 0, win->sizey-1);
 	sv3= screen_addvert(sc, win->sizex-1, win->sizey-1);
@@ -902,6 +900,8 @@
 	newsc= screen_add(win, sc->id.name+2);
 	/* copy all data */
 	screen_copy(newsc, sc);
+	/* set in window */
+	win->screen= newsc;
 	
 	return newsc;
 }
@@ -1229,7 +1229,7 @@
 		C->screen->full = SCREENFULL;
 		
 		oldscreen= C->screen;
-		sc= screen_add(C->window, "temp");	/* sets C->window->screen! */
+		sc= screen_add(C->window, "temp");
 		
 		/* returns the top small area */
 		newa= area_split(C->window, sc, (ScrArea *)sc->areabase.first, 'h', 0.99f);

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2008-12-17 22:52:13 UTC (rev 17914)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2008-12-18 01:48:24 UTC (rev 17915)
@@ -258,6 +258,7 @@
 	
 	/* allocs new screen and adds to newly created window, using window size */
 	newsc= screen_add(win, C->screen->id.name+2);
+	win->screen= newsc;
 	
 	/* copy area to new screen */
 	area_copy_data((ScrArea *)newsc->areabase.first, C->area, 0);





More information about the Bf-blender-cvs mailing list