[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50849] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Fix crash on sequencer when movie clip fails to load frame

Sergey Sharybin sergey.vfx at gmail.com
Mon Sep 24 16:48:24 CEST 2012


Revision: 50849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50849
Author:   nazgul
Date:     2012-09-24 14:48:24 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
Fix crash on sequencer when movie clip fails to load frame

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-24 14:36:25 UTC (rev 50848)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-24 14:48:24 UTC (rev 50849)
@@ -2583,17 +2583,19 @@
 		case SEQ_TYPE_MOVIECLIP:
 		{
 			ibuf = seq_render_movieclip_strip(context, seq, nr);
-			sequencer_imbuf_assign_spaces(context.scene, ibuf);
 
-			if (ibuf && use_preprocess) {
-				ImBuf *i = IMB_dupImBuf(ibuf);
+			if (ibuf) {
+				if (use_preprocess) {
+					ImBuf *i = IMB_dupImBuf(ibuf);
 
-				IMB_freeImBuf(ibuf);
+					IMB_freeImBuf(ibuf);
 
-				ibuf = i;
+					ibuf = i;
+				}
+
+				copy_to_ibuf_still(context, seq, nr, ibuf);
 			}
 
-			copy_to_ibuf_still(context, seq, nr, ibuf);
 			break;
 		}
 




More information about the Bf-blender-cvs mailing list