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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-15 17:17:54 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-22 12:13:33 +0300
commite22ca0fb860ed945eb3438bfe6dba8040cfd7cf3 (patch)
tree0e7cfbecb035d9096559e1871796ca92ec6d3a99 /source/blender/blenloader
parent05306d97663b4281d4b17bfc7e1ed913ce07966f (diff)
SceneRenderLayer > SceneLayer: Convert samples_override
Note: Cycles still need to handle its own doversion for theses cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d38a9a12999..f6801d22a53 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -306,6 +306,16 @@ void do_versions_after_linking_280(Main *main)
SceneLayer *scene_layer = BKE_scene_layer_add(scene, srl->name);
+ if (srl->samples != 0) {
+ /* It is up to the external engine to handle
+ * its own doversion in this case. */
+ BKE_override_scene_layer_int_add(
+ scene_layer,
+ ID_SCE,
+ "samples",
+ srl->samples);
+ }
+
if (srl->mat_override) {
BKE_override_scene_layer_datablock_add(
scene_layer,