diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-13 00:31:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-13 00:31:30 +0400 |
| commit | 32586e6805dea4af46955a86b102989992b7e24c (patch) | |
| tree | e58a81521cf473981601a7bc3c5da3c12bf14cea /source/blender/editors | |
| parent | 99e97afbe398fe44ceae6a85039a80c32b5a4606 (diff) | |
Fix #35470: crash rendering from the terminal in some cases due to render info
text threading issue.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index abc91b4329d..b9653da47e6 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -650,7 +650,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even rj->lay = v3d->lay; rj->v3d_override = true; } - else if (camera_override != scene->camera) + else if (camera_override && camera_override != scene->camera) rj->v3d_override = true; if (v3d->localvd) @@ -1060,9 +1060,8 @@ static void render_view3d_do(RenderEngine *engine, const bContext *C) rp->bmain = CTX_data_main(C); copy_m4_m4(rp->viewmat, rp->rv3d->viewmat); - /* dont alloc in threads */ - if (engine->text == NULL) - engine->text = MEM_callocN(IMA_MAX_RENDER_TEXT, "rendertext"); + /* clear info text */ + engine->text[0] = '\0'; /* setup job */ WM_jobs_customdata_set(wm_job, rp, render_view3d_free); |