diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-26 19:55:50 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-26 19:55:50 +0400 |
| commit | 1dbd3ae6291349f044c6eaa9b87b8e686f476865 (patch) | |
| tree | e2bd9345b55ddf89277d1eb6c37d136153649d45 /source/blender/render/extern | |
| parent | 4cfca0adfeeadccf0013aaeb8b34315b2d2a8e33 (diff) | |
Fix T38831: blender internal enabling shadow pass changes material node diffuse.
It would include/exclude shadow depending on the pass being disabled/enabled,
but that should have no influence on the combined render result. Now it always
includes shadow.
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 57e52a9316b..70e3edccb2c 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -50,9 +50,10 @@ typedef struct ShadeResult { float col[4]; float alpha, mist, z; float emit[3]; - float diff[3]; /* no ramps, shadow, etc */ - float spec[3]; - float shad[4]; /* shad[3] is shadow intensity */ + float diff[3]; /* diffuse with no ramps, shadow, etc */ + float diffshad[3]; /* diffuse with shadow */ + float spec[3]; /* specular with shadow */ + float shad[4]; /* shad[3] is shadow intensity */ float ao[3]; float env[3]; float indirect[3]; |