From 2687b63bf76f0e77847df6d547d038b5d3dbc0f5 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Sun, 12 Feb 2017 01:19:33 +0100 Subject: Cycles Denoising: Remove Render Pass changes --- source/blender/makesdna/DNA_node_types.h | 9 ++++--- source/blender/makesdna/DNA_scene_types.h | 40 ++----------------------------- 2 files changed, 6 insertions(+), 43 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 1e2ef0cc7d3..fd601e55550 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -159,8 +159,7 @@ typedef enum eNodeSocketFlag { SOCK_COLLAPSED = 64, /* socket collapsed in UI */ SOCK_HIDE_VALUE = 128, /* hide socket value, if it gets auto default */ SOCK_AUTO_HIDDEN__DEPRECATED = 256, /* socket hidden automatically, to distinguish from manually hidden */ - SOCK_NO_INTERNAL_LINK = 512, - SOCK_VIRTUAL = 1024 /* socket behaves like SOCK_UNAVAIL, but is drawn with dashed links */ + SOCK_NO_INTERNAL_LINK = 512 } eNodeSocketFlag; /* limit data in bNode to what we want to see saved? */ @@ -570,9 +569,9 @@ typedef struct NodeEllipseMask { /* layer info for image node outputs */ typedef struct NodeImageLayer { /* index in the Image->layers->passes lists */ - int pass_index DNA_DEPRECATED; - /* render pass name */ - char pass_name[64]; /* amount defined in openexr_multi.h */ + int pass_index; + /* render pass flag, in case this is an original render pass */ + int pass_flag; } NodeImageLayer; typedef struct NodeBlurData { diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 0f6b1276eb3..966818a1bf7 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -234,9 +234,7 @@ typedef struct SceneRenderLayer { int samples; float pass_alpha_threshold; - - IDProperty *prop; - + struct FreestyleConfig freestyleConfig; } SceneRenderLayer; @@ -305,43 +303,9 @@ typedef enum ScenePassType { SCE_PASS_SUBSURFACE_DIRECT = (1 << 28), SCE_PASS_SUBSURFACE_INDIRECT = (1 << 29), SCE_PASS_SUBSURFACE_COLOR = (1 << 30), + SCE_PASS_DEBUG = (1 << 31), /* This is a virtual pass. */ } ScenePassType; -#define RE_PASSNAME_COMBINED "Combined" -#define RE_PASSNAME_Z "Depth" -#define RE_PASSNAME_VECTOR "Vector" -#define RE_PASSNAME_NORMAL "Normal" -#define RE_PASSNAME_UV "UV" -#define RE_PASSNAME_RGBA "Color" -#define RE_PASSNAME_EMIT "Emit" -#define RE_PASSNAME_DIFFUSE "Diffuse" -#define RE_PASSNAME_SPEC "Spec" -#define RE_PASSNAME_SHADOW "Shadow" - -#define RE_PASSNAME_AO "AO" -#define RE_PASSNAME_ENVIRONMENT "Env" -#define RE_PASSNAME_INDIRECT "Indirect" -#define RE_PASSNAME_REFLECT "Reflect" -#define RE_PASSNAME_REFRACT "Refract" -#define RE_PASSNAME_INDEXOB "IndexOB" -#define RE_PASSNAME_INDEXMA "IndexMA" -#define RE_PASSNAME_MIST "Mist" - -#define RE_PASSNAME_RAYHITS "RayHits" -#define RE_PASSNAME_DIFFUSE_DIRECT "DiffDir" -#define RE_PASSNAME_DIFFUSE_INDIRECT "DiffInd" -#define RE_PASSNAME_DIFFUSE_COLOR "DiffCol" -#define RE_PASSNAME_GLOSSY_DIRECT "GlossDir" -#define RE_PASSNAME_GLOSSY_INDIRECT "GlossInd" -#define RE_PASSNAME_GLOSSY_COLOR "GlossCol" -#define RE_PASSNAME_TRANSM_DIRECT "TransDir" -#define RE_PASSNAME_TRANSM_INDIRECT "TransInd" -#define RE_PASSNAME_TRANSM_COLOR "TransCol" - -#define RE_PASSNAME_SUBSURFACE_DIRECT "SubsurfaceDir" -#define RE_PASSNAME_SUBSURFACE_INDIRECT "SubsurfaceInd" -#define RE_PASSNAME_SUBSURFACE_COLOR "SubsurfaceCol" - /* note, srl->passflag is treestore element 'nr' in outliner, short still... */ /* View - MultiView */ -- cgit v1.2.3