diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-15 19:31:30 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-15 19:37:02 +0300 |
| commit | cd21236ea1d1fcd0bef579375a9de67b114b591f (patch) | |
| tree | 7db2d1f86d105af93bca0fa46ca505b079e037de | |
| parent | 51404724ccb097716a711231675c9a3c11cfb24f (diff) | |
Fix duplication of scene, it was missing duplication of layer properties
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ad00ba909b4..f54a02f033a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -318,8 +318,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) SceneLayer *new_sl = scen->render_layers.first; for (SceneLayer *sl = sce->render_layers.first; sl; sl = sl->next) { new_sl->stats = NULL; - new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); new_sl->properties_evaluated = NULL; + new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + IDP_MergeGroup(new_sl->properties, sl->properties, true); /* we start fresh with no overrides and no visibility flags set * instead of syncing both trees we simply unlink and relink the scene collection */ |