[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18645] branches/blender2.5/blender/source /blender/editors: my last commit broke transforming metastrips, use find_id for scene lookup.

[Campbell Barton]

Revision: 18645
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18645
Author:   campbellbarton
Date:     2009-01-24 10:55:31 +0100 (Sat, 24 Jan 2009)

Log Message:
-----------
my last commit broke transforming metastrips, use find_id for scene lookup.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c

Modified: branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c	2009-01-24 08:21:39 UTC (rev 18644)
+++ branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c	2009-01-24 09:55:31 UTC (rev 18645)
@@ -1100,11 +1100,9 @@
 	channel= RNA_int_get(op->ptr, "channel");
 	
 	RNA_string_get(op->ptr, "scene", sce_name);
+
+	sce_seq= find_id("SC", sce_name);
 	
-	for(sce_seq= CTX_data_main(C)->scene.first; sce_seq; sce_seq= sce_seq->id.next)
-		if (strcmp(sce_seq->id.name+2, sce_name)==0)
-			break;
-	
 	if (sce_seq==NULL) {
 		BKE_reportf(op->reports, RPT_ERROR, "Scene \"%s\" not found", sce_name);
 		return OPERATOR_CANCELLED;

Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c	2009-01-24 08:21:39 UTC (rev 18644)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c	2009-01-24 09:55:31 UTC (rev 18645)
@@ -3294,9 +3294,10 @@
 /* This function applies the rules for transforming a strip so duplicate
  * checks dont need to be added in multiple places.
  *
- * count and recursive MUST be set.
+ * recursive, count and flag MUST be set.
  *
- * seq->depth must be set
+ * seq->depth must be set before running this function so we know if the strips
+ * are root level or not
  */
 static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count, int *flag)
 {
@@ -3357,23 +3358,25 @@
 				*count= 0;
 				*flag= 0;
 			}
-			else if ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
-				*flag= seq->flag;
-				*count= 2; /* we need 2 transdata's */
-			} else {
-				*flag= seq->flag;
-				*count= 1; /* selected or with a handle selected */
-			}
+			else {
+				if ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
+					*flag= seq->flag;
+					*count= 2; /* we need 2 transdata's */
+				} else {
+					*flag= seq->flag;
+					*count= 1; /* selected or with a handle selected */
+				}
 
-			/* Recursive */
+				/* Recursive */
 
-			if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
-				/* if any handles are selected, dont recurse */
-				*recursive = 1;
+				if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
+					/* if any handles are selected, dont recurse */
+					*recursive = 1;
+				}
+				else {
+					*recursive = 0;
+				}
 			}
-			else {
-				*recursive = 0;
-			}
 		}
 		else {
 			/* Nested, different rules apply */