From 2dfd117ab5d52fcb730e9dbad18fdd29bebccd4d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 7 Jan 2021 15:04:26 +1100 Subject: [PATCH] Fix memory leak duplicating a scene with "Copy Settings" --- source/blender/blenkernel/intern/scene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index c099fdb0e19..adc50c2247b 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1904,7 +1904,6 @@ Scene *BKE_scene_duplicate(Main *bmain, Scene *sce, eSceneCopyMethod type) sce_copy->id.properties = IDP_CopyProperty(sce->id.properties); } - MEM_freeN(sce_copy->toolsettings); BKE_sound_destroy_scene(sce_copy); /* copy color management settings */ @@ -1929,6 +1928,7 @@ Scene *BKE_scene_duplicate(Main *bmain, Scene *sce, eSceneCopyMethod type) sce_copy->display = sce->display; /* tool settings */ + BKE_toolsettings_free(sce_copy->toolsettings); sce_copy->toolsettings = BKE_toolsettings_copy(sce->toolsettings, 0); /* make a private copy of the avicodecdata */