[Bf-blender-cvs] [d994391e0c6] master: Fix T77994: VSE crash adding a glow effect strip
Philipp Oeser
noreply at git.blender.org
Sat Jun 20 06:52:34 CEST 2020
Commit: d994391e0c6e3346e0723a8cf6d7288521c04dfe
Author: Philipp Oeser
Date: Sat Jun 20 06:42:31 2020 +0200
Branches: master
https://developer.blender.org/rBd994391e0c6e3346e0723a8cf6d7288521c04dfe
Fix T77994: VSE crash adding a glow effect strip
Since rB47f98a38d0f8 not all 3 effect inputs were assigned anymore. Their
ImBuf's rect was accessed though in do_glow_effect (even though unused in
the following dedicated functions).
Just pass NULL here instead.
Reviewed By: ISS
Differential Revision: https://developer.blender.org/D8064
===================================================================
M source/blender/blenkernel/intern/seqeffects.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 9fa43ed0a5f..5527a4aabdd 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2810,7 +2810,7 @@ static ImBuf *do_glow_effect(const SeqRenderData *context,
context->rectx,
context->recty,
ibuf1->rect_float,
- ibuf2->rect_float,
+ NULL,
out->rect_float);
}
else {
@@ -2821,7 +2821,7 @@ static ImBuf *do_glow_effect(const SeqRenderData *context,
context->rectx,
context->recty,
(unsigned char *)ibuf1->rect,
- (unsigned char *)ibuf2->rect,
+ NULL,
(unsigned char *)out->rect);
}
More information about the Bf-blender-cvs
mailing list