[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35924] trunk/blender/source/blender/ editors/screen/screen_ops.c: Bugfix #26687

[Ton Roosendaal]

Revision: 35924
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35924
Author:   ton
Date:     2011-03-31 17:14:31 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
Bugfix #26687

Using "New scene" operator was setting the screen->scene pointer
after the undo-push, messing up redos or undos immediate after.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2011-03-31 15:28:53 UTC (rev 35923)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2011-03-31 17:14:31 UTC (rev 35924)
@@ -3162,6 +3162,7 @@
 static int scene_new_exec(bContext *C, wmOperator *op)
 {
 	Scene *newscene, *scene= CTX_data_scene(C);
+	bScreen *screen= CTX_wm_screen(C);
 	Main *bmain= CTX_data_main(C);
 	int type= RNA_enum_get(op->ptr, "type");
 
@@ -3180,8 +3181,12 @@
 		}
 	}
 	
+	/* this notifier calls ED_screen_set_scene, doing a lot of UI stuff, not for inside event loops */
 	WM_event_add_notifier(C, NC_SCENE|ND_SCENEBROWSE, newscene);
 	
+	if(screen)
+		screen->scene= newscene;
+	
 	return OPERATOR_FINISHED;
 }