diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-01-07 07:04:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-07 07:04:26 +0300 |
| commit | 2dfd117ab5d52fcb730e9dbad18fdd29bebccd4d (patch) | |
| tree | 12f2f84493eaadd9aae344c1229af1be372f363a /source/blender/blenkernel | |
| parent | a9dea9cfaa756396153223f1eb2d8dc3161ded01 (diff) | |
Fix memory leak duplicating a scene with "Copy Settings"
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |