sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

more sequence -> sequencer rename, also made sequencer swap strip update effects strips

Browse Source
This commit is contained in:
Campbell Barton 2009-12-13 15:48:57 +00:00
parent abe8c09b8a
commit 61da7bb866
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/properties_render.py
View 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()

2
source/blender/blenkernel/intern/scene.c
View 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");

2
source/blender/blenkernel/intern/sequencer.c
View 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;

11
source/blender/blenlib/intern/path_util.c
View 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>

9
source/blender/editors/space_sequencer/sequencer_edit.c
View 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;

2
source/blender/makesrna/intern/makesrna.c
View 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},

2
source/blender/makesrna/intern/rna_internal.h
View 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);

2
source/blender/makesrna/intern/rna_scene.c
View 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);

2
source/blender/makesrna/intern/rna_sequence.c → source/blender/makesrna/intern/rna_sequencer.c
View 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);