[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29976] trunk/blender/source/blender/ editors/render/render_internal.c: Fix #22189: fields rendering crashes.

Brecht Van Lommel brecht at blender.org
Mon Jul 5 11:31:24 CEST 2010


Revision: 29976
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29976
Author:   blendix
Date:     2010-07-05 11:31:24 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
Fix #22189: fields rendering crashes.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-07-05 09:00:44 UTC (rev 29975)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-07-05 09:31:24 UTC (rev 29976)
@@ -508,11 +508,14 @@
 
 	rr= RE_AcquireResultRead(rj->re);
 
-	/* malloc OK here, stats_draw is not in tile threads */
-	if(rr->text==NULL)
-		rr->text= MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
+	if(rr) {
+		/* malloc OK here, stats_draw is not in tile threads */
+		if(rr->text==NULL)
+			rr->text= MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext");
 
-	make_renderinfo_string(rs, rj->scene, rr->text);
+		make_renderinfo_string(rs, rj->scene, rr->text);
+	}
+
 	RE_ReleaseResult(rj->re);
 
 	/* make jobs timer to send notifier */





More information about the Bf-blender-cvs mailing list