Cycles: Shader node features are to be inherited from the base class
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Jun 2015 09:48:24 +0000 (14:48 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Jun 2015 14:49:52 +0000 (19:49 +0500)
intern/cycles/render/nodes.h

index ac7bbaf3547f32135b65046cd80b937be7c99a28..c0a118dd9b2ae81a9370810e397030857301196f 100644 (file)
@@ -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 {