[Bf-blender-cvs] [93549d4] gooseberry: Tabbing into (but not out of) scene strips is supported now

Antony Riakiotakis noreply at git.blender.org
Fri Feb 6 17:08:58 CET 2015


Commit: 93549d42250ed24833313a87c6d397fbcce1cf90
Author: Antony Riakiotakis
Date:   Fri Feb 6 17:08:51 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB93549d42250ed24833313a87c6d397fbcce1cf90

Tabbing into (but not out of) scene strips is supported now

===================================================================

M	source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 848fbc8..e1bdbbc 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -2460,17 +2460,26 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 	MetaStack *ms;
 
 	if (last_seq && last_seq->type == SEQ_TYPE_META && last_seq->flag & SELECT) {
-		/* Enter Metastrip */
-		ms = MEM_mallocN(sizeof(MetaStack), "metastack");
-		BLI_addtail(&ed->metastack, ms);
-		ms->parseq = last_seq;
-		ms->oldbasep = ed->seqbasep;
-		copy_v2_v2_int(ms->disp_range, &ms->parseq->startdisp);
+			/* Enter Metastrip */
+			ms = MEM_mallocN(sizeof(MetaStack), "metastack");
+			BLI_addtail(&ed->metastack, ms);
+			ms->parseq = last_seq;
+			ms->oldbasep = ed->seqbasep;
+			copy_v2_v2_int(ms->disp_range, &ms->parseq->startdisp);
+
+			ed->seqbasep = &last_seq->seqbase;
 
-		ed->seqbasep = &last_seq->seqbase;
+			BKE_sequencer_active_set(scene, NULL);
+	}
+	/* scene strip */
+	else if (last_seq && last_seq->type == SEQ_TYPE_SCENE && last_seq->scene &&
+	         (last_seq->flag & SEQ_SCENE_STRIPS) && (last_seq->flag & SELECT))
+	{
+		ED_screen_set_scene(C, CTX_wm_screen(C), last_seq->scene);
 
-		BKE_sequencer_active_set(scene, NULL);
+		 WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, last_seq->scene);
 
+		 return OPERATOR_FINISHED;
 	}
 	else {
 		/* Exit Metastrip (if possible) */




More information about the Bf-blender-cvs mailing list