[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45179] trunk/blender: Fix for own error in sequencer's Select menu (from r40658, makes me wonder if anyone uses that feature except me...), and update to Select Grouped op ( taking into account new MovieClip strip type).

[Bastien Montagne]

Revision: 45179
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45179
Author:   mont29
Date:     2012-03-26 13:45:06 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Fix for own error in sequencer's Select menu (from r40658, makes me wonder if anyone uses that feature except me...), and update to Select Grouped op (taking into account new MovieClip strip type).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40658

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2012-03-26 13:36:22 UTC (rev 45178)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2012-03-26 13:45:06 UTC (rev 45179)
@@ -143,7 +143,7 @@
         layout.operator("sequencer.select_handles", text="Left Handle").side = 'LEFT'
         layout.operator("sequencer.select_handles", text="Right Handle").side = 'RIGHT'
         layout.separator()
-        layout.operator_menu_enum("object.select_grouped", "type", text="Grouped")
+        layout.operator_menu_enum("sequencer.select_grouped", "type", text="Grouped")
         layout.operator("sequencer.select_linked")
         layout.operator("sequencer.select_all").action = 'TOGGLE'
         layout.operator("sequencer.select_all").action = 'INVERT'

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2012-03-26 13:36:22 UTC (rev 45178)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2012-03-26 13:45:06 UTC (rev 45179)
@@ -929,7 +929,7 @@
 
 #define SEQ_IS_EFFECT(_seq) (_seq->type & SEQ_EFFECT)
 
-#define SEQ_USE_DATA(_seq) (_seq->type == SEQ_SCENE || SEQ_HAS_PATH(_seq))
+#define SEQ_USE_DATA(_seq) (ELEM(_seq->type, SEQ_SCENE, SEQ_MOVIECLIP) || SEQ_HAS_PATH(_seq))
 
 static short select_grouped_type(Editing *ed, Sequence *actseq)
 {
@@ -985,7 +985,6 @@
 {
 	Sequence *seq;
 	short changed = FALSE;
-	Scene *sce = actseq->scene;
 	char *dir = actseq->strip ? actseq->strip->dir : NULL;
 
 	if (!SEQ_USE_DATA(actseq))
@@ -1000,7 +999,8 @@
 		}
 		SEQ_END;
 	}
-	else {
+	else if (actseq->type == SEQ_SCENE) {
+		Scene *sce = actseq->scene;
 		SEQP_BEGIN(ed, seq) {
 			if (seq->type == SEQ_SCENE && seq->scene == sce) {
 				seq->flag |= SELECT;
@@ -1009,6 +1009,16 @@
 		}
 		SEQ_END;
 	}
+	else if (actseq->type == SEQ_MOVIECLIP) {
+		MovieClip *clip = actseq->clip;
+		SEQP_BEGIN(ed, seq) {
+			if (seq->type == SEQ_MOVIECLIP && seq->clip == clip) {
+				seq->flag |= SELECT;
+				changed = TRUE;
+			}
+		}
+		SEQ_END;
+	}
 
 	return changed;
 }
@@ -1117,6 +1127,10 @@
 	return changed;
 }
 
+#undef SEQ_IS_SOUND
+#undef SEQ_IS_EFFECT
+#undef SEQ_USE_DATA
+
 static int sequencer_select_grouped_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene  = CTX_data_scene(C);