[Bf-blender-cvs] [45cae17] master: Fix T46757: Blender Close when try to render an Animation

Sergey Sharybin noreply at git.blender.org
Fri Nov 13 07:05:48 CET 2015


Commit: 45cae17b25b1be3379d3b055277675e7e13a44ed
Author: Sergey Sharybin
Date:   Fri Nov 13 11:05:14 2015 +0500
Branches: master
https://developer.blender.org/rB45cae17b25b1be3379d3b055277675e7e13a44ed

Fix T46757: Blender Close when try to render an Animation

Was a missing NULL-pointer check in recent frameserver commit.

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index fe8535a1..4a079c6 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3581,7 +3581,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 
 			/* Special case for 'mh->get_next_frame'
 			 * this overrides regular frame stepping logic */
-			if (mh->get_next_frame) {
+			if (mh && mh->get_next_frame) {
 				while (G.is_break == false) {
 					int nfra_test = mh->get_next_frame(re->movie_ctx_arr[0], &re->r, re->reports);
 					if (nfra_test >= 0 && nfra_test >= sfra && nfra_test <= efra) {




More information about the Bf-blender-cvs mailing list