diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-02-09 07:18:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-02-09 07:18:30 +0300 |
| commit | 41a7b23c4100240bb35cadd57f13972d422c1269 (patch) | |
| tree | 45058284ae05429dae7aa2b83c4613e2732e2bc0 | |
| parent | ecf5250cf39db6093b8069f710bda9adae1fbd8b (diff) | |
- Py seq API - Added an option for seq_strip.update() to run update_changed_seq_and_deps and new_tstripdata
- Render stamp sequencer option wasn't ignoring muted strips.
| -rw-r--r-- | source/blender/python/api2_2x/sceneSequence.c | 14 | ||||
| -rw-r--r-- | source/blender/src/editseq.c | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/python/api2_2x/sceneSequence.c b/source/blender/python/api2_2x/sceneSequence.c index 8775ae9dc63..afcc8e0588d 100644 --- a/source/blender/python/api2_2x/sceneSequence.c +++ b/source/blender/python/api2_2x/sceneSequence.c @@ -102,7 +102,7 @@ returns None if notfound.\nIf 'name' is not specified, it returns a list of all /* Python BPy_Sequence methods table: */ /*****************************************************************************/ static PyObject *Sequence_copy(BPy_Sequence * self); -static PyObject *Sequence_update(BPy_Sequence * self); +static PyObject *Sequence_update(BPy_Sequence * self, PyObject *args); static PyObject *Sequence_new(BPy_Sequence * self, PyObject * args); static PyObject *Sequence_remove(BPy_Sequence * self, PyObject * args); static PyObject *Sequence_rebuildProxy(BPy_Sequence * self); @@ -121,7 +121,7 @@ static PyMethodDef BPy_Sequence_methods[] = { "() - Return a copy of the sequence containing the same objects."}, {"copy", (PyCFunction) Sequence_copy, METH_NOARGS, "() - Return a copy of the sequence containing the same objects."}, - {"update", (PyCFunction) Sequence_update, METH_NOARGS, + {"update", (PyCFunction) Sequence_update, METH_VARARGS, "() - Force and update of the sequence strip"}, {"rebuildProxy", (PyCFunction) Sequence_rebuildProxy, METH_VARARGS, "() - Rebuild the active strip's Proxy."}, @@ -587,8 +587,16 @@ static PyObject *Sequence_copy(BPy_Sequence * self) Py_RETURN_NONE; } -static PyObject *Sequence_update(BPy_Sequence * self) +static PyObject *Sequence_update(BPy_Sequence * self, PyObject *args) { + int data= 0; + if (!PyArg_ParseTuple(args, "|i:update", &data)) + return NULL; + + if (data) { + update_changed_seq_and_deps(self->seq, 1, 1); + new_tstripdata(self->seq); + } calc_sequence(self->seq); calc_sequence_disp(self->seq); Py_RETURN_NONE; diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index d16e3f28671..76e44e5c24f 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -183,7 +183,7 @@ Sequence *get_forground_frame_seq(int frame) if(!ed) return NULL; for (seq=ed->seqbasep->first; seq; seq= seq->next) { - if(seq->startdisp > frame || seq->enddisp <= frame) + if(seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame) continue; /* only use elements you can see - not */ if (ELEM6(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE, SEQ_MOVIE_AND_HD_SOUND, SEQ_COLOR)) { |