diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 13:31:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 13:31:24 +0400 |
| commit | 51e74c26f7ce929ffcae4790ed27e31cf756ec4c (patch) | |
| tree | 7af723a59b808623c081d5d9e4b4d32d28e660e0 /source/blender | |
| parent | d9e9aa1e4d7a63f7ed9a6c8ae6097eeb55b2e6dc (diff) | |
Fix #22189: fields rendering crashes.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 3634c10e147..8f4b02b8d64 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -508,11 +508,14 @@ static void image_renderinfo_cb(void *rjv, RenderStats *rs) 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 */ |