From 3f4e3f718fdc1163cc52a84d85978fa94b230211 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 28 Dec 2018 18:37:05 +0100 Subject: Cycles: restore old sample and material override settings for view layers. Since there will be no view layer overrides in 2.80, this is needed still. --- source/blender/makesdna/DNA_layer_types.h | 3 ++- source/blender/makesdna/DNA_scene_types.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index c3e819c5538..d959d54b07f 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -76,9 +76,10 @@ typedef struct ViewLayer { /* Old SceneRenderLayer data. */ int layflag; int passflag; /* pass_xor has to be after passflag */ - int pass_xor; float pass_alpha_threshold; + int samples; + struct Material *mat_override; struct IDProperty *id_properties; /* Equivalent to datablocks ID properties. */ struct FreestyleConfig freestyle_config; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 2d0838a04c5..d100449c353 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -194,7 +194,7 @@ typedef struct SceneRenderLayer { char name[64] DNA_DEPRECATED; /* MAX_NAME */ - struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer override. */ + struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer setting. */ unsigned int lay DNA_DEPRECATED; /* Converted to LayerCollection cycles camera visibility override. */ unsigned int lay_zmask DNA_DEPRECATED; /* Converted to LayerCollection cycles holdout override. */ @@ -205,7 +205,7 @@ typedef struct SceneRenderLayer { int passflag DNA_DEPRECATED; /* pass_xor has to be after passflag */ int pass_xor DNA_DEPRECATED; /* Converted to ViewLayer passflag and flag. */ - int samples DNA_DEPRECATED; /* Converted to ViewLayer override. */ + int samples DNA_DEPRECATED; /* Converted to ViewLayer setting. */ float pass_alpha_threshold DNA_DEPRECATED; /* Converted to ViewLayer pass_alpha_threshold. */ IDProperty *prop DNA_DEPRECATED; /* Converted to ViewLayer id_properties. */ -- cgit v1.2.3