Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-02-13 09:24:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-02-13 09:24:15 +0300
commitb052ae4cdbfea85d50827efd10a5a4e953836463 (patch)
tree0ad937940dd82de375e63583ff4a6e79d9c5f36b
parent64d2984aa0b9687c277f8ca7a4e8622ec92758a4 (diff)
[#18209] 3 VSE crash bugs with .blends (all left click and move mouse over Metastrip/Blend Mode related)
Workaround for a bug where dragging the playhead over a metastrip with blending on it could segfault blender. Tried to figure out why the imbuf rect is not set, but for now a NULL check stops the crash.
-rw-r--r--source/blender/src/sequence.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index 219768b2776..3c3c7c7b30a 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -2111,6 +2111,14 @@ static TStripElem* do_build_seq_recursively(Sequence * seq, int cfra)
}
}
+/* Bug: 18209
+ * when dragging the mouse over a metastrip, on mouse-up for some unknown
+ * reason in some cases the metastrips TStripElem->ibuf->rect is NULL,
+ * This should be fixed but I had a look and couldnt work out why its
+ * happening so for now workaround with a NULL check - campbell */
+
+#define SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+
static TStripElem* do_build_seq_array_recursively(
ListBase *seqbasep, int cfra, int chanshown)
{
@@ -2277,7 +2285,14 @@ static TStripElem* do_build_seq_array_recursively(
!se2->ibuf_comp->rect_float) {
IMB_rect_from_float(se2->ibuf);
}
-
+
+#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+ if (se2->ibuf->rect==NULL && se2->ibuf->rect_float==NULL) {
+ printf("ERROR: sequencer se2->ibuf missing buffer\n");
+ } else if (se1->ibuf->rect==NULL && se1->ibuf->rect_float==NULL) {
+ printf("ERROR: sequencer se1->ibuf missing buffer\n");
+ } else {
+#endif
/* bad hack, to fix crazy input ordering of
those two effects */
@@ -2299,6 +2314,10 @@ static TStripElem* do_build_seq_array_recursively(
se2->ibuf_comp);
}
+#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+ }
+#endif
+
IMB_cache_limiter_insert(se2->ibuf_comp);
IMB_cache_limiter_ref(se2->ibuf_comp);
IMB_cache_limiter_touch(se2->ibuf_comp);