[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35933] trunk/blender/source/blender: fix [#26713] Video Sequencer: Audio mute after making meta strip copy/paste
Campbell Barton
ideasman42 at gmail.com
Fri Apr 1 10:51:13 CEST 2011
Revision: 35933
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35933
Author: campbellbarton
Date: 2011-04-01 08:51:12 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
fix [#26713] Video Sequencer: Audio mute after making meta strip copy/paste
was not recursively restoring sound strips on paste.
also found many duplicate functions were defining the transform mode as in int but getting as an enum, use enum for both now.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/makesrna/RNA_enum_types.h
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-04-01 08:51:12 UTC (rev 35933)
@@ -258,6 +258,7 @@
void seq_single_fix(struct Sequence *seq);
int seq_test_overlap(struct ListBase * seqbasep, struct Sequence *test);
void seq_translate(struct Scene *scene, struct Sequence *seq, int delta);
+void seq_sound_init(struct Scene *scene, struct Sequence *seq);
struct Sequence *seq_foreground_frame_get(struct Scene *scene, int frame);
struct ListBase *seq_seqbase(struct ListBase *seqbase, struct Sequence *seq);
void seq_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs);
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -2974,6 +2974,24 @@
calc_sequence_disp(evil_scene, seq);
}
+void seq_sound_init(Scene *scene, Sequence *seq)
+{
+ if(seq->type==SEQ_META) {
+ Sequence *seq_child;
+ for(seq_child= seq->seqbase.first; seq_child; seq_child= seq_child->next) {
+ seq_sound_init(scene, seq_child);
+ }
+ }
+ else {
+ if(seq->sound) {
+ seq->scene_sound = sound_add_scene_sound(scene, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs);
+ }
+ if(seq->scene) {
+ sound_scene_add_scene_sound(scene, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs);
+ }
+ }
+}
+
Sequence *seq_foreground_frame_get(Scene *scene, int frame)
{
Editing *ed= seq_give_editing(scene, FALSE);
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -87,6 +87,7 @@
#include "RNA_access.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
/* Undo stuff */
typedef struct {
@@ -4755,7 +4756,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/***************** make cyclic operator **********************/
@@ -5629,7 +5630,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/********************** delete operator *********************/
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -45,6 +45,7 @@
#include "RNA_define.h"
#include "RNA_access.h"
+#include "RNA_enum_types.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
@@ -1768,6 +1769,6 @@
ot->poll= ED_operator_editmesh;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -48,6 +48,7 @@
#include "RNA_define.h"
#include "RNA_access.h"
+#include "RNA_enum_types.h"
#include "BKE_depsgraph.h"
#include "BKE_context.h"
@@ -326,7 +327,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/***************************** Delete operator *****************************/
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/object/object_add.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -1703,7 +1703,7 @@
/* to give to transform */
RNA_def_boolean(ot->srna, "linked", 0, "Linked", "Duplicate object but not object data, linking to the original data.");
- prop= RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
RNA_def_property_flag(prop, PROP_HIDDEN);
}
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -171,7 +171,7 @@
float *rf= rectf;
char *rc= rectc;
float rgb[3];
- const float dither = ibuf->dither / 255.0;
+ const float dither = ibuf->dither / 255.0f;
/* XXX temp. because crop offset */
if( rectc >= (char *)(ibuf->rect)) {
Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_edit.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -711,7 +711,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TIME_TRANSLATE, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/* ******************** Delete Keyframes Operator ************************* */
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -830,7 +830,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/* ******************** Delete Keyframes Operator ************************* */
Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -678,7 +678,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/* ******************** Delete Strips Operator ***************************** */
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -62,6 +62,7 @@
#include "WM_types.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
/* for menu/popup icons etc etc*/
@@ -1678,7 +1679,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* to give to transform */
- RNA_def_int(ot->srna, "mode", TFM_TRANSLATION, 0, INT_MAX, "Mode", "", 0, INT_MAX);
+ RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
}
/* delete operator */
@@ -2671,21 +2672,6 @@
/* properties */
}
-static void seq_offset(Scene *scene, Sequence *seq, int ofs)
-{
- if(seq->type == SEQ_META) {
- Sequence *iseq;
- for(iseq= seq->seqbase.first; iseq; iseq= iseq->next) {
- seq_offset(scene, iseq, ofs);
- }
- }
- else {
- seq->start += ofs;
- }
-
- calc_sequence_disp(scene, seq);
-}
-
static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
{
Scene *scene= CTX_data_scene(C);
@@ -2702,14 +2688,8 @@
/* transform pasted strips before adding */
if(ofs) {
for(iseq= nseqbase.first; iseq; iseq= iseq->next) {
- seq_offset(scene, iseq, ofs);
- /* XXX, ffmpeg too? */
- if(iseq->sound) {
- iseq->scene_sound = sound_add_scene_sound(scene, iseq, iseq->startdisp, iseq->enddisp, iseq->startofs + iseq->anim_startofs);
- }
- if(iseq->scene) {
- sound_scene_add_scene_sound(scene, iseq, iseq->startdisp, iseq->enddisp, iseq->startofs + iseq->anim_startofs);
- }
+ seq_translate(scene, iseq, ofs);
+ seq_sound_init(scene, iseq);
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c 2011-04-01 06:56:45 UTC (rev 35932)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c 2011-04-01 08:51:12 UTC (rev 35933)
@@ -110,6 +110,39 @@
{NULL, 0}
};
+EnumPropertyItem transform_mode_types[] =
+{
+ {TFM_INIT, "INIT", 0, "Init", ""},
+ {TFM_DUMMY, "DUMMY", 0, "Dummy", ""},
+ {TFM_TRANSLATION, "TRANSLATION", 0, "Translation", ""},
+ {TFM_ROTATION, "ROTATION", 0, "Rotation", ""},
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list