diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-04 13:27:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-05-04 13:27:28 +0300 |
| commit | ffa31a84212b09e85058911c66acfff7ad019ba6 (patch) | |
| tree | cf467a36af2000c530ba0c008f62469711d53c45 /source/blender/blenkernel/intern/scene.c | |
| parent | 0f4de9336a44ecc88bf2e2dfd752a7a92c74c255 (diff) | |
Fix use after free of new render layer ID properites after copying scene
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 009fafc591e..5933aaccd66 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -233,6 +233,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* copy Freestyle settings */ new_srl = scen->r.layers.first; for (srl = sce->r.layers.first; srl; srl = srl->next) { + if (new_srl->prop != NULL) { + new_srl->prop = IDP_CopyProperty(new_srl->prop); + } BKE_freestyle_config_copy(&new_srl->freestyleConfig, &srl->freestyleConfig); if (type == SCE_COPY_FULL) { for (lineset = new_srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { |