[Bf-blender-cvs] [97b1b67] master: Fix crash reporting render errors during baking.
Brecht Van Lommel
noreply at git.blender.org
Sun Sep 27 02:21:37 CEST 2015
Commit: 97b1b6775fd16635e3d65c8653ff94ad6417c2c5
Author: Brecht Van Lommel
Date: Wed Sep 23 00:28:53 2015 +0200
Branches: master
https://developer.blender.org/rB97b1b6775fd16635e3d65c8653ff94ad6417c2c5
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