diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-01 12:48:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-01 17:49:52 +0300 |
| commit | 14251e8b4515a134d5f5c9617215d8f95a30724e (patch) | |
| tree | cf701146355bf07b87ab2c139878dcd83a3c32d8 /intern | |
| parent | 1fc656391751a87a25b915f9841236cb9ba57cee (diff) | |
Cycles: Shader node features are to be inherited from the base class
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/nodes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index ac7bbaf3547..c0a118dd9b2 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -415,7 +415,9 @@ public: void attributes(Shader *shader, AttributeRequestSet *attributes); bool has_spatial_varying() { return true; } - virtual int get_feature() { return NODE_FEATURE_HAIR; } + virtual int get_feature() { + return ShaderNode::get_feature() | NODE_FEATURE_HAIR; + } }; class ValueNode : public ShaderNode { |