diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 20:43:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 20:43:42 +0400 |
commit | 5d74235b5fc0f73c4fe33ab28ac1f1b8753131ee (patch) | |
tree | 3adb7eb15cb7b22bc1df719626ccef2f5e01ac30 /source/blender/makesrna | |
parent | c78f02d9908773ec29d10b31c9401bb17eb5eacb (diff) |
patch [#30481] rna_Screen_scene_set does the wrong thing [patch]
from Dan Eicher (dna)
--- from the tracker
Setting Screen.scene only uses the active screen through a call to CTX_wm_screen(C) instead of the actual referenced scene.
The attached py-op demonstrates this behavior, assuming at least two separate scenes in the VSE.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 073624965ea..1afd5d816d1 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -131,7 +131,7 @@ void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports, struc } if (CTX_wm_screen(C)->scene == scene) - ED_screen_set_scene(C, newscene); + ED_screen_set_scene(C, CTX_wm_screen(C), newscene); unlink_scene(bmain, scene, newscene); } diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index d72b8c8f73b..88c982609ea 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -72,7 +72,7 @@ static void rna_Screen_scene_update(bContext *C, PointerRNA *ptr) /* exception: must use context so notifier gets to the right window */ if (sc->newscene) { - ED_screen_set_scene(C, sc->newscene); + ED_screen_set_scene(C, sc, sc->newscene); WM_event_add_notifier(C, NC_SCENE|ND_SCENEBROWSE, sc->newscene); if (G.f & G_DEBUG) |