From 56f89666eefe064f00cef2af270f0d014eb673f7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 29 May 2016 15:10:34 +0200 Subject: Code refactor: centralize OSL node creation in shader manager. --- intern/cycles/render/nodes.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'intern/cycles/render/nodes.h') diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 43dc1dd26fe..9ece9b86eac 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -966,17 +966,22 @@ public: SHADER_NODE_CLASS(SetNormalNode) }; -class OSLScriptNode : public ShaderNode { +class OSLNode : public ShaderNode { public: - SHADER_NODE_CLASS(OSLScriptNode) + static OSLNode *create(size_t num_inputs); + ~OSLNode(); + + SHADER_NODE_BASE_CLASS(OSLNode) /* ideally we could beter detect this, but we can't query this now */ bool has_spatial_varying() { return true; } + virtual bool equals(const ShaderNode * /*other*/) { return false; } string filepath; string bytecode_hash; - virtual bool equals(const ShaderNode * /*other*/) { return false; } +private: + OSLNode(); }; class NormalMapNode : public ShaderNode { -- cgit v1.2.3