Merging r46495 through r46557 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_conversions.c
index f2677cb278782cda057b9c0909eb5c2d653cd26f..472e3ae0d1a62577d2b0735c12e50ea6f066886d 100644 (file)
@@ -2184,7 +2184,7 @@ void flushTransNodes(TransInfo *t)
 
 void flushTransSeq(TransInfo *t)
 {
-       ListBase *seqbasep= seq_give_editing(t->scene, FALSE)->seqbasep; /* Editing null check already done */
+       ListBase *seqbasep= BKE_sequencer_editing_get(t->scene, FALSE)->seqbasep; /* Editing null check already done */
        int a, new_frame, old_start;
        TransData *td= NULL;
        TransData2D *td2d= NULL;
@@ -3983,7 +3983,7 @@ static int SeqToTransData_Recursive(TransInfo *t, ListBase *seqbase, TransData *
 
 static void freeSeqData(TransInfo *t)
 {
-       Editing *ed= seq_give_editing(t->scene, FALSE);
+       Editing *ed= BKE_sequencer_editing_get(t->scene, FALSE);
 
        if (ed != NULL) {
                ListBase *seqbasep= ed->seqbasep;
@@ -4089,7 +4089,7 @@ static void freeSeqData(TransInfo *t)
                                }
                        }
 
-                       sort_seq(t->scene);
+                       BKE_sequencer_sort(t->scene);
                }
                else {
                        /* Cancelled, need to update the strips display */
@@ -4119,7 +4119,7 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 
        View2D *v2d= UI_view2d_fromcontext(C);
        Scene *scene= t->scene;
-       Editing *ed= seq_give_editing(t->scene, FALSE);
+       Editing *ed= BKE_sequencer_editing_get(t->scene, FALSE);
        TransData *td = NULL;
        TransData2D *td2d= NULL;
        TransDataSeq *tdsq= NULL;