Merging r47572 through r47580 form trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 38ac8c2999c30f1830df3301ada3614bbc32b4ae..429a3b3d86ac47291463f2285ddbbb462ebd7ef7 100644 (file)
@@ -2239,7 +2239,7 @@ void flushTransSeq(TransInfo *t)
                        if ((seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
                                seq->start= new_frame - tdsq->start_offset;
 #else
-                       if (seq->type != SEQ_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
+                       if (seq->type != SEQ_TYPE_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
                                seq->start= new_frame - tdsq->start_offset;
 #endif
                        if (seq->depth==0) {
@@ -2282,7 +2282,7 @@ void flushTransSeq(TransInfo *t)
 
                /* calc all meta's then effects [#27953] */
                for (seq = seqbasep->first; seq; seq = seq->next) {
-                       if (seq->type == SEQ_META && seq->flag & SELECT) {
+                       if (seq->type == SEQ_TYPE_META && seq->flag & SELECT) {
                                calc_sequence(t->scene, seq);
                        }
                }
@@ -3787,7 +3787,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
                        *count = 0;
                        *flag = 0;
                }
-               else if (seq->type == SEQ_META) {
+               else if (seq->type == SEQ_TYPE_META) {
 
                        /* for meta's we only ever need to extend their children, no matter what depth
                         * just check the meta's are in the bounds */
@@ -3844,7 +3844,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
                                /* Recursive */
 
-                               if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
+                               if ((seq->type == SEQ_TYPE_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
                                        /* if any handles are selected, don't recurse */
                                        *recursive = TRUE;
                                }
@@ -3859,9 +3859,9 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 #ifdef SEQ_TX_NESTED_METAS
                        *flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
                        *count = 1; /* ignore the selection for nested */
-                       *recursive = (seq->type == SEQ_META);
+                       *recursive = (seq->type == SEQ_TYPE_META);
 #else
-                       if (seq->type == SEQ_META) {
+                       if (seq->type == SEQ_TYPE_META) {
                                /* Meta's can only directly be moved between channels since they
                                 * don't have their start and length set directly (children affect that)
                                 * since this Meta is nested we don't need any of its data in fact.
@@ -4064,7 +4064,7 @@ static void freeSeqData(TransInfo *t)
                                                seq= ((TransDataSeq *)td->extra)->seq;
                                                if ((seq != seq_prev)) {
                                                        /* check effects strips, we cant change their time */
-                                                       if ((seq->type & SEQ_EFFECT) && seq->seq1) {
+                                                       if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
                                                                has_effect= TRUE;
                                                        }
                                                        else {
@@ -4123,7 +4123,7 @@ static void freeSeqData(TransInfo *t)
                                                for (a=0; a<t->total; a++, td++) {
                                                        seq= ((TransDataSeq *)td->extra)->seq;
                                                        if ((seq != seq_prev)) {
-                                                               if ((seq->type & SEQ_EFFECT) && seq->seq1) {
+                                                               if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
                                                                        calc_sequence(t->scene, seq);
                                                                }
                                                        }
@@ -4135,7 +4135,7 @@ static void freeSeqData(TransInfo *t)
                                                for (a=0; a<t->total; a++, td++) {
                                                        seq= ((TransDataSeq *)td->extra)->seq;
                                                        if ((seq != seq_prev)) {
-                                                               if ((seq->type & SEQ_EFFECT) && seq->seq1) {
+                                                               if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
                                                                        if (seq_test_overlap(seqbasep, seq)) {
                                                                                shuffle_seq(seqbasep, seq, t->scene);
                                                                        }
@@ -4150,7 +4150,7 @@ static void freeSeqData(TransInfo *t)
 
                        for (seq= seqbasep->first; seq; seq= seq->next) {
                                /* We might want to build a list of effects that need to be updated during transform */
-                               if (seq->type & SEQ_EFFECT) {
+                               if (seq->type & SEQ_TYPE_EFFECT) {
                                        if      (seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
                                        else if (seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
                                        else if (seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
@@ -4219,7 +4219,7 @@ static void createTransSeqData(bContext *C, TransInfo *t)
                Sequence *seq;
                for (seq= ed->seqbasep->first; seq; seq= seq->next) {
                        /* hack */
-                       if ((seq->flag & SELECT)==0 && seq->type & SEQ_EFFECT) {
+                       if ((seq->flag & SELECT)==0 && seq->type & SEQ_TYPE_EFFECT) {
                                Sequence *seq_user;
                                int i;
                                for (i=0; i<3; i++) {