[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26402] trunk/blender/source/blender: edits to 26400

[Campbell Barton]

Revision: 26402
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26402
Author:   campbellbarton
Date:     2010-01-29 18:01:53 +0100 (Fri, 29 Jan 2010)

Log Message:
-----------
edits to 26400
- use the endframe operator property
- dont use the startstill setting, gives odd results (start frame isnt the 
startframe)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sequencer.h
    trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h     2010-01-29 
16:32:06 UTC (rev 26401)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h     2010-01-29 
17:01:53 UTC (rev 26402)
@@ -204,6 +204,7 @@
 /* api for adding new sequence strips */
 typedef struct SeqLoadInfo {
        int start_frame;
+       int end_frame;
        int channel;
        int flag;       /* use sound, replace sel */
        int type;

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c        
2010-01-29 16:32:06 UTC (rev 26401)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c        
2010-01-29 17:01:53 UTC (rev 26402)
@@ -148,13 +148,19 @@
        memset(seq_load, 0, sizeof(SeqLoadInfo));
 
        seq_load->start_frame=  RNA_int_get(op->ptr, "start_frame");
+       seq_load->end_frame=    seq_load->start_frame; /* un-set */
+
        seq_load->channel=              RNA_int_get(op->ptr, "channel");
-       seq_load->len=                  1; // images only!
+       seq_load->len=                  1; // images only, if endframe isnt set!
 
        RNA_string_get(op->ptr, "name", seq_load->name+2);
 
        RNA_string_get(op->ptr, "path", seq_load->path); /* full path, file is 
set by the caller */
 
+       if (RNA_struct_find_property(op->ptr, "end_frame")) {
+               seq_load->end_frame = RNA_int_get(op->ptr, "end_frame");
+       }
+
        if (RNA_struct_find_property(op->ptr, "replace_sel") && 
RNA_boolean_get(op->ptr, "replace_sel"))
                seq_load->flag |= SEQ_LOAD_REPLACE_SEL;
 
@@ -417,8 +423,9 @@
        }
        else {
                BLI_split_dirfile_basic(seq_load.path, NULL, se->name);
-               seq->startstill= 25;
-               seq->endstill= 25;
+               if(seq_load.start_frame < seq_load.end_frame) {
+                       seq->endstill= seq_load.end_frame - 
seq_load.start_frame;
+               }
        }
        
        calc_sequence_disp(seq);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs