[Bf-blender-cvs] [14251e8] master: Cycles: Shader node features are to be inherited from the base class

[Sergey Sharybin]

Commit: 14251e8b4515a134d5f5c9617215d8f95a30724e
Author: Sergey Sharybin
Date:   Mon Jun 1 14:48:24 2015 +0500
Branches: master
https://developer.blender.org/rB14251e8b4515a134d5f5c9617215d8f95a30724e

Cycles: Shader node features are to be inherited from the base class

===================================================================

M	intern/cycles/render/nodes.h

===================================================================

diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index ac7bbaf..c0a118d 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 {