diff options
author | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
commit | a0f754e7749a485c97718433edbbab5ac76cdc7a (patch) | |
tree | d968d66e73be6dbac5997a3f5bb8e33e462c96d3 /source/blender/render/intern/pipeline.c | |
parent | 137a5e162c2435662dbb299ff49771e7d2e7598f (diff) | |
parent | 523bc981cfeecead5050e7af44bbe252c166d718 (diff) |
Merge branch 'master' into refactor-idprop-ui-datarefactor-idprop-ui-data
Diffstat (limited to 'source/blender/render/intern/pipeline.c')
-rw-r--r-- | source/blender/render/intern/pipeline.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 9ef52b4bf41..bf42adbab87 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -569,6 +569,7 @@ Render *RE_NewRender(const char *name) BLI_strncpy(re->name, name, RE_MAXNAME); BLI_rw_mutex_init(&re->resultmutex); BLI_rw_mutex_init(&re->partsmutex); + BLI_mutex_init(&re->highlighted_tiles_mutex); } RE_InitRenderCB(re); @@ -633,12 +634,17 @@ void RE_FreeRender(Render *re) BLI_rw_mutex_end(&re->resultmutex); BLI_rw_mutex_end(&re->partsmutex); + BLI_mutex_end(&re->highlighted_tiles_mutex); BLI_freelistN(&re->view_layers); BLI_freelistN(&re->r.views); BKE_curvemapping_free_data(&re->r.mblur_shutter_curve); + if (re->highlighted_tiles != NULL) { + BLI_gset_free(re->highlighted_tiles, MEM_freeN); + } + /* main dbase can already be invalid now, some database-free code checks it */ re->main = NULL; re->scene = NULL; |