diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-23 16:41:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-23 16:41:21 +0300 |
| commit | d891c8f1f802f91629ca63c149f126fd19f9a5d9 (patch) | |
| tree | c44f6886e1bf9b494409499699c69a39a1b3d441 /intern/cycles/render/nodes.h | |
| parent | 859d5e56994a8ec274e701a3b6ffae57d848b5c8 (diff) | |
| parent | 874f12480f465374e53ee1870cf108828172fe17 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/nodes.h')
| -rw-r--r-- | intern/cycles/render/nodes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index e77fb22f5ed..4590178395f 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -1031,6 +1031,7 @@ public: float3 value; protected: + using ShaderNode::constant_fold; void constant_fold(const ConstantFolder& folder, ShaderInput *value_in); void compile(SVMCompiler& compiler, int type, ShaderInput *value_in, ShaderOutput *value_out); void compile(OSLCompiler& compiler, const char *name); |