[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59780] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: fix for missing NULL check before calling BKE_sequencer_imbuf_to_sequencer_space ().

Campbell Barton ideasman42 at gmail.com
Tue Sep 3 23:54:17 CEST 2013


Revision: 59780
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59780
Author:   campbellbarton
Date:     2013-09-03 21:54:17 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
fix for missing NULL check before calling BKE_sequencer_imbuf_to_sequencer_space().

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	2013-09-03 21:22:43 UTC (rev 59779)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-09-03 21:54:17 UTC (rev 59780)
@@ -2678,12 +2678,14 @@
 				                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
 				                         seq_rendersize_to_proxysize(context.preview_render_size));
 
-				BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE);
+				if (ibuf) {
+					BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE);
 
-				/* we don't need both (speed reasons)! */
-				if (ibuf && ibuf->rect_float && ibuf->rect)
-					imb_freerectImBuf(ibuf);
-				if (ibuf) {
+					/* we don't need both (speed reasons)! */
+					if (ibuf->rect_float && ibuf->rect) {
+						imb_freerectImBuf(ibuf);
+					}
+
 					seq->strip->stripdata->orig_width = ibuf->x;
 					seq->strip->stripdata->orig_height = ibuf->y;
 				}




More information about the Bf-blender-cvs mailing list