[Bf-blender-cvs] [c31bace] blender-v2.76-release: Fix crash reporting render errors during baking.

Brecht Van Lommel noreply at git.blender.org
Wed Sep 30 17:10:36 CEST 2015


Commit: c31bace2a4d3ca31bedd0dc2f97c3c1f41c794a3
Author: Brecht Van Lommel
Date:   Wed Sep 23 00:28:53 2015 +0200
Branches: blender-v2.76-release
https://developer.blender.org/rBc31bace2a4d3ca31bedd0dc2f97c3c1f41c794a3

Fix crash reporting render errors during baking.

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

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

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

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index fef453e..8adac7c 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -361,10 +361,12 @@ void RE_engine_set_error_message(RenderEngine *engine, const char *msg)
 	Render *re = engine->re;
 	if (re != NULL) {
 		RenderResult *rr = RE_AcquireResultRead(re);
-		if (rr->error != NULL) {
-			MEM_freeN(rr->error);
+		if (rr) {
+			if (rr->error != NULL) {
+				MEM_freeN(rr->error);
+			}
+			rr->error = BLI_strdup(msg);
 		}
-		rr->error = BLI_strdup(msg);
 		RE_ReleaseResult(re);
 	}
 }




More information about the Bf-blender-cvs mailing list