[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25338] trunk/blender: more sequence -> sequencer rename, also made sequencer swap strip update effects strips
Campbell Barton
ideasman42 at gmail.com
Sun Dec 13 16:48:57 CET 2009
Revision: 25338
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25338
Author: campbellbarton
Date: 2009-12-13 16:48:57 +0100 (Sun, 13 Dec 2009)
Log Message:
-----------
more sequence -> sequencer rename, also made sequencer swap strip update effects strips
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Added Paths:
-----------
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
Removed Paths:
-------------
trunk/blender/source/blender/makesrna/intern/rna_sequence.c
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/release/scripts/ui/properties_render.py 2009-12-13 15:48:57 UTC (rev 25338)
@@ -530,7 +530,7 @@
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()
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -860,7 +860,7 @@
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");
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -472,6 +472,8 @@
void calc_sequence(Sequence *seq)
{
+ printf(" ddd %s\n", seq->name);
+
Sequence *seqm;
int min, max;
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -1,10 +1,6 @@
-/* util.c
+/**
+ * $Id$
*
- * various string, file, list operations.
- *
- *
- * $Id$
- *
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -29,7 +25,8 @@
* Contributor(s): none yet.
*
* ***** END GPL LICENSE BLOCK *****
- *
+ *
+ * various string, file, list operations.
*/
#include <stdio.h>
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -2557,7 +2557,7 @@
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 @@
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;
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -2020,7 +2020,7 @@
{"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},
Modified: trunk/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_internal.h 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/makesrna/intern/rna_internal.h 2009-12-13 15:48:57 UTC (rev 25338)
@@ -154,7 +154,7 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -2190,7 +2190,7 @@
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);
Deleted: trunk/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-12-13 14:56:45 UTC (rev 25337)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-12-13 15:48:57 UTC (rev 25338)
@@ -1,1186 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contributor(s): Blender Foundation (2008)
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdlib.h>
-#include <limits.h>
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-#include "RNA_types.h"
-
-#include "rna_internal.h"
-
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
-
-#include "BKE_sequencer.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "WM_types.h"
-
-#ifdef RNA_RUNTIME
-
-/* build a temp referene to the parent */
-static void meta_tmp_ref(Sequence *seq_par, Sequence *seq)
-{
- for (; seq; seq= seq->next) {
- seq->tmp= seq_par;
- if(seq->type == SEQ_META) {
- meta_tmp_ref(seq, seq->seqbase.first);
- }
- }
-}
-
-static void rna_SequenceEditor_sequences_all_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
-{
- Scene *sce= (Scene*)ptr->id.data;
- Editing *ed= seq_give_editing(sce, FALSE);
-
- meta_tmp_ref(NULL, ed->seqbase.first);
-
- rna_iterator_listbase_begin(iter, &ed->seqbase, NULL);
-}
-
-static void rna_SequenceEditor_sequences_all_next(CollectionPropertyIterator *iter)
-{
- ListBaseIterator *internal= iter->internal;
- Sequence *seq= (Sequence*)internal->link;
-
- if(seq->seqbase.first)
- internal->link= (Link*)seq->seqbase.first;
- else if(seq->next)
- internal->link= (Link*)seq->next;
- else {
- internal->link= NULL;
-
- do {
- seq= seq->tmp; // XXX - seq's dont reference their parents!
- if(seq && seq->next) {
- internal->link= (Link*)seq->next;
- break;
- }
- } while(seq);
- }
-
- iter->valid= (internal->link != NULL);
-}
-
-static void rna_Sequence_start_frame_set(PointerRNA *ptr, int value)
-{
- Sequence *seq= (Sequence*)ptr->data;
- Scene *sce= (Scene*)ptr->id.data;
- Editing *ed= seq_give_editing(sce, FALSE);
-
- seq->start= value;
- calc_sequence_disp(seq);
-
- if( seq_test_overlap(ed->seqbasep, seq) ) {
- shuffle_seq(ed->seqbasep, seq);
- }
- sort_seq(sce);
-}
-
-static void rna_Sequence_length_set(PointerRNA *ptr, int value)
-{
- Sequence *seq= (Sequence*)ptr->data;
- Scene *sce= (Scene*)ptr->id.data;
- Editing *ed= seq_give_editing(sce, FALSE);
-
- seq_tx_set_final_right(seq, seq->start+value);
- calc_sequence_disp(seq);
-
- if( seq_test_overlap(ed->seqbasep, seq) ) {
- shuffle_seq(ed->seqbasep, seq);
- }
- sort_seq(sce);
-}
-
-static int rna_Sequence_length_get(PointerRNA *ptr)
-{
- Sequence *seq= (Sequence*)ptr->data;
- return seq_tx_get_final_right(seq, 0)-seq_tx_get_final_left(seq, 0);
-}
-
-static void rna_Sequence_channel_set(PointerRNA *ptr, int value)
-{
- Sequence *seq= (Sequence*)ptr->data;
- Scene *sce= (Scene*)ptr->id.data;
- Editing *ed= seq_give_editing(sce, FALSE);
-
- seq->machine= value;
-
- if( seq_test_overlap(ed->seqbasep, seq) ) {
- shuffle_seq(ed->seqbasep, seq);
- }
- sort_seq(sce);
-}
-
-/* properties that need to allocate structs */
-static void rna_Sequence_use_color_balance_set(PointerRNA *ptr, int value)
-{
- Sequence *seq= (Sequence*)ptr->data;
- int c;
-
- if(value) {
- seq->flag |= SEQ_USE_COLOR_BALANCE;
- if(seq->strip->color_balance == NULL) {
- seq->strip->color_balance = MEM_callocN(sizeof(struct StripColorBalance), "StripColorBalance");
- for (c=0; c<3; c++) {
- seq->strip->color_balance->lift[c] = 1.0f;
- seq->strip->color_balance->gamma[c] = 1.0f;
- seq->strip->color_balance->gain[c] = 1.0f;
- }
- }
- } else {
- seq->flag ^= SEQ_USE_COLOR_BALANCE;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list