[Bf-blender-cvs] [86ea76254d3] master: Fix T62614: Copy eevee settings when scene is copied
Jacques Lucke
noreply at git.blender.org
Fri Mar 15 16:08:12 CET 2019
Commit: 86ea76254d3f625bf3d9e15dade5d5b3544c06a3
Author: Jacques Lucke
Date: Fri Mar 15 16:06:30 2019 +0100
Branches: master
https://developer.blender.org/rB86ea76254d3f625bf3d9e15dade5d5b3544c06a3
Fix T62614: Copy eevee settings when scene is copied
Reviewers: brecht, fclem
Differential Revision: https://developer.blender.org/D4520
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list