diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-26 15:46:55 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-26 15:46:55 +0400 |
| commit | 63f1e253c360dcb550bc4b492ccdf0bebf3afa22 (patch) | |
| tree | 1dfc762a92efa44b1eb301f970bbf98f7f46827c /intern/cycles/render/nodes.h | |
| parent | 00234dab2f1a697a33659beee4f4c8856b5ce233 (diff) | |
| parent | d5fd3b36888902367b07d92f7c606a95d603e23b (diff) | |
Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'intern/cycles/render/nodes.h')
| -rw-r--r-- | intern/cycles/render/nodes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 72904657390..670d8da7825 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -182,7 +182,7 @@ public: class ConvertNode : public ShaderNode { public: - ConvertNode(ShaderSocketType from, ShaderSocketType to); + ConvertNode(ShaderSocketType from, ShaderSocketType to, bool autoconvert = false); SHADER_NODE_BASE_CLASS(ConvertNode) ShaderSocketType from, to; |