archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r43183:43220

Browse Source
This commit is contained in:
Campbell Barton
2012-01-08 13:09:09 +00:00
parent da84f3d4c9 3dead22c73
commit 98bdf0274b
34 changed files with 245 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/screen/screen_ops.c
View File

@@ -3307,7 +3307,6 @@ static void SCREEN_OT_delete(wmOperatorType *ot)
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");
@@ -3326,11 +3325,9 @@ static int scene_new_exec(bContext *C, wmOperator *op)
}
}
/* 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);
ED_screen_set_scene(C, newscene);
if(screen)
screen->scene= newscene;
WM_event_add_notifier(C, NC_SCENE|ND_SCENEBROWSE, newscene);
return OPERATOR_FINISHED;
}
@@ -3366,9 +3363,14 @@ static void SCENE_OT_new(wmOperatorType *ot)
static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op))
{
Scene *scene= CTX_data_scene(C);
ED_screen_delete_scene(C, scene);
if(G.f & G_DEBUG)
printf("scene delete %p\n", scene);
WM_event_add_notifier(C, NC_SCENE|NA_REMOVED, scene);
return OPERATOR_FINISHED;
}