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/editors/space_outliner/outliner_select.c | |
| 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/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index a71ea9a6d4a..4814edf585e 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -190,7 +190,7 @@ static int tree_element_set_active_object(bContext *C, Scene *scene, SpaceOops sce= (Scene *)outliner_search_back(soops, te, ID_SCE); if(sce && scene != sce) { - ED_screen_set_scene(C, sce); + ED_screen_set_scene(C, CTX_wm_screen(C), sce); } /* find associated base in current scene */ @@ -374,7 +374,7 @@ static int tree_element_active_world(bContext *C, Scene *scene, SpaceOops *soops if(set) { // make new scene active if(sce && scene != sce) { - ED_screen_set_scene(C, sce); + ED_screen_set_scene(C, CTX_wm_screen(C), sce); } } @@ -761,7 +761,7 @@ static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, Spa /* editmode? */ if(te->idcode==ID_SCE) { if(scene!=(Scene *)tselem->id) { - ED_screen_set_scene(C, (Scene *)tselem->id); + ED_screen_set_scene(C, CTX_wm_screen(C), (Scene *)tselem->id); } } else if(te->idcode==ID_GR) { |