Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-03-15 18:06:30 +0300
committerJacques Lucke <mail@jlucke.com>2019-03-15 18:06:30 +0300
commit86ea76254d3f625bf3d9e15dade5d5b3544c06a3 (patch)
tree8643492b4736540d425b5f8a5ae290dd5295f1b9 /source/blender
parentac147872cca748e33bd84da5dbb34ab22f02ffca (diff)
Fix T62614: Copy eevee settings when scene is copied
Reviewers: brecht, fclem Differential Revision: https://developer.blender.org/D4520
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/scene.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 83df851f0d1..9c174c8025f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -318,6 +318,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
}
sce_dst->eevee.light_cache = NULL;
+ sce_dst->eevee.light_cache_info[0] = '\0';
/* TODO Copy the cache. */
}
@@ -339,6 +340,9 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
sce_copy->unit = sce->unit;
sce_copy->physics_settings = sce->physics_settings;
sce_copy->audio = sce->audio;
+ sce_copy->eevee = sce->eevee;
+ sce_copy->eevee.light_cache = NULL;
+ sce_copy->eevee.light_cache_info[0] = '\0';
if (sce->id.properties)
sce_copy->id.properties = IDP_CopyProperty(sce->id.properties);