Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / render / nodes.h
index e77fb22f5ed97f8684bf9e94f85e8807a0198dc1..4590178395f18c64b7045a3722f325baca6492a6 100644 (file)
@@ -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);