diff options
Diffstat (limited to 'source/blender/render/intern/source/pipeline.c')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index e381a7ea6f5..4cf36826bba 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -230,7 +230,7 @@ static int render_scene_needs_vector(Render *re) { SceneRenderLayer *srl; - for (srl = re->scene->r.layers.first; srl; srl = srl->next) + for (srl = re->r.layers.first; srl; srl = srl->next) if (!(srl->layflag & SCE_LAY_DISABLE)) if (srl->passflag & SCE_PASS_VECTOR) return 1; @@ -412,6 +412,8 @@ void RE_FreeRender(Render *re) RE_engine_free(re->engine); BLI_rw_mutex_end(&re->resultmutex); + + BLI_freelistN(&re->r.layers); /* main dbase can already be invalid now, some database-free code checks it */ re->main = NULL; @@ -508,7 +510,11 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * re->ok = TRUE; /* maybe flag */ re->i.starttime = PIL_check_seconds_timer(); - re->r = *rd; /* hardcopy */ + + /* copy render data and render layers for thread safety */ + BLI_freelistN(&re->r.layers); + re->r = *rd; + BLI_duplicatelist(&re->r.layers, &rd->layers); if (source) { /* reuse border flags from source renderer */ |