more sequence -> sequencer rename, also made sequencer swap strip update effects...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 13 Dec 2009 15:48:57 +0000 (15:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 13 Dec 2009 15:48:57 +0000 (15:48 +0000)
release/scripts/ui/properties_render.py
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/intern/path_util.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequencer.c [moved from source/blender/makesrna/intern/rna_sequence.c with 99% similarity]

index 7f5ce213aed62895be92f7fa5782145149ed1928..fbb402efaaa34cc20310957a7e0c986880ae347d 100644 (file)
@@ -530,7 +530,7 @@ class RENDER_PT_stamp(RenderButtonsPanel):
         col.prop(rd, "stamp_camera", text="Camera")
         col.prop(rd, "stamp_filename", text="Filename")
         col.prop(rd, "stamp_marker", text="Marker")
-        col.prop(rd, "stamp_sequence_strip", text="Seq. Strip")
+        col.prop(rd, "stamp_sequencer_strip", text="Seq. Strip")
 
         if wide_ui:
             col = split.column()
index 43017a758355bf1a231dcecbc67eff1efcebeda9..4312f23bd9b6ee9dfaee2d11c24538c8e7a3857a 100644 (file)
@@ -860,7 +860,7 @@ void scene_update_for_newframe(Scene *sce, unsigned int lay)
 void scene_add_render_layer(Scene *sce)
 {
        SceneRenderLayer *srl;
-       int tot= 1 + BLI_countlist(&sce->r.layers);
+//     int tot= 1 + BLI_countlist(&sce->r.layers);
        
        srl= MEM_callocN(sizeof(SceneRenderLayer), "new render layer");
        sprintf(srl->name, "RenderLayer");
index c5ca24bec454fad2a46fd98fde94a9d405eef3e9..7450e810b896269e0f512296204389c9e8bc4f05 100644 (file)
@@ -472,6 +472,8 @@ void calc_sequence_disp(Sequence *seq)
 
 void calc_sequence(Sequence *seq)
 {
+       printf(" ddd %s\n", seq->name);
+
        Sequence *seqm;
        int min, max;
 
index 5ff4dfe4e963208c738ab2f3845a0d29a23a8c72..bf7a4f77f9ef004c1e2626eb83274f32acb8fcd6 100644 (file)
@@ -1,9 +1,5 @@
-/* util.c
- *
- * various string, file, list operations.
- *
- *
- * $Id$
+/**
+ *  $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -29,7 +25,8 @@
  * Contributor(s): none yet.
  *
  * ***** END GPL LICENSE BLOCK *****
- * 
+ *
+ * various string, file, list operations.
  */
 
 #include <stdio.h>
index 9685a2e1e20c29b3b9f2bc19b04824849476a806..c421c7fbb8568cbfce19b2aa8f0d8fc7b91d6f5d 100644 (file)
@@ -2557,7 +2557,7 @@ static int sequencer_swap_internal_exec(bContext *C, int side)
        Scene *scene= CTX_data_scene(C);
        Editing *ed= seq_give_editing(scene, FALSE);
        Sequence *active_seq = active_seq_get(scene);
-       Sequence *seq;
+       Sequence *seq, *iseq;
 
        if(ed==NULL) return OPERATOR_CANCELLED;
        if(active_seq==NULL) return OPERATOR_CANCELLED;
@@ -2586,6 +2586,13 @@ static int sequencer_swap_internal_exec(bContext *C, int side)
                                break;
                }
 
+               // XXX - should be a generic function
+               for(iseq= scene->ed->seqbasep->first; iseq; iseq= iseq->next) {
+                       //if((iseq->type & SEQ_EFFECT) && ELEM6(iseq, seq->seq1, seq->seq2, seq->seq3, active_seq->seq1, active_seq->seq2, active_seq->seq3))
+                       if(iseq->type & SEQ_EFFECT)
+                                       calc_sequence(iseq);
+               }
+
                WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);
 
                return OPERATOR_FINISHED;
index 96953cefa2e9b926cb6a5eaaa4daaf06d3bda994..5bdfe228e89afecd09175ef8c6ea4ae8e67ad08b 100644 (file)
@@ -2020,7 +2020,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_screen.c", NULL, RNA_def_screen},
        {"rna_sculpt_paint.c", NULL, RNA_def_sculpt_paint},
        {"rna_sensor.c", NULL, RNA_def_sensor},
-       {"rna_sequence.c", NULL, RNA_def_sequence},
+       {"rna_sequencer.c", NULL, RNA_def_sequencer},
        {"rna_smoke.c", NULL, RNA_def_smoke},
        {"rna_space.c", NULL, RNA_def_space},
        {"rna_test.c", NULL, RNA_def_test},
index 6f4233b93374da4586e63e6366cea4c4375faa23..f43db74286b0a7693523691b3391429dff7cf1be 100644 (file)
@@ -154,7 +154,7 @@ void RNA_def_scene(struct BlenderRNA *brna);
 void RNA_def_screen(struct BlenderRNA *brna);
 void RNA_def_sculpt_paint(struct BlenderRNA *brna);
 void RNA_def_sensor(struct BlenderRNA *brna);
-void RNA_def_sequence(struct BlenderRNA *brna);
+void RNA_def_sequencer(struct BlenderRNA *brna);
 void RNA_def_smoke(struct BlenderRNA *brna);
 void RNA_def_space(struct BlenderRNA *brna);
 void RNA_def_test(struct BlenderRNA *brna);
index 83a945f2bea77a4f1fcb1edf90522f6fc7945119..51344fdf8b3c893e2dd78471d025b8a5a27d6e93 100644 (file)
@@ -2190,7 +2190,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Stamp Filename", "Include the filename of the .blend file in image metadata");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
        
-       prop= RNA_def_property(srna, "stamp_sequence_strip", PROP_BOOLEAN, PROP_NONE);
+       prop= RNA_def_property(srna, "stamp_sequencer_strip", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_SEQSTRIP);
        RNA_def_property_ui_text(prop, "Stamp Sequence Strip", "Include the name of the foreground sequence strip in image metadata");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
similarity index 99%
rename from source/blender/makesrna/intern/rna_sequence.c
rename to source/blender/makesrna/intern/rna_sequencer.c
index a86fe1a9e5d31083d9cc7295d36d3f2e1460353b..2eee35164aff7c5ae42cc7ee77a93c391e7c49af 100644 (file)
@@ -1157,7 +1157,7 @@ static void rna_def_speed_control(BlenderRNA *brna)
        RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");
 }
 
-void RNA_def_sequence(BlenderRNA *brna)
+void RNA_def_sequencer(BlenderRNA *brna)
 {
        rna_def_strip_element(brna);
        rna_def_strip_proxy(brna);