diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-08 01:18:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 18:29:25 +0300 |
| commit | 9b9921b765bca2dacc7ec0633dcf0ab1ab68be68 (patch) | |
| tree | 0eb5a3745a9eeb6596ba230a2de941fc5b0baa31 /intern/cycles/render/shader.h | |
| parent | e7d13b8a1da046d7bb78a3c0e21bbb575ed6074e (diff) | |
Code refactor: nodify Cycles shader and lights.
Differential Revision: https://developer.blender.org/D2016
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 4a1502cb86d..dc57ed4e4eb 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -26,6 +26,8 @@ #include "attribute.h" #include "kernel_types.h" +#include "node.h" + #include "util_map.h" #include "util_param.h" #include "util_string.h" @@ -70,10 +72,10 @@ enum VolumeInterpolation { * volume and displacement, that the shader manager will compile and execute * separately. */ -class Shader { +class Shader : public Node { public: - /* name */ - string name; + NODE_DECLARE; + int pass_id; /* shader graph */ |