Code refactor: add generic Cycles node infrastructure.

Differential Revision: https://developer.blender.org/D2016
2016-05-07 19:47:37 +02:00
parent 841d008b98
commit ec51175f1f
20 changed files with 1000 additions and 18 deletions
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -3,6 +3,7 @@ set(INC
 	.
 	..
 	../svm
+	../../graph
 	../../render
 	../../util
 	../../device
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -51,7 +51,7 @@ CCL_NAMESPACE_BEGIN
 */
 #define NODE_FEATURE_ALL        (NODE_FEATURE_VOLUME|NODE_FEATURE_HAIR|NODE_FEATURE_BUMP)

-typedef enum NodeType {
+typedef enum ShaderNodeType {
 	NODE_END = 0,
 	NODE_CLOSURE_BSDF,
 	NODE_CLOSURE_EMISSION,
@@ -127,7 +127,7 @@ typedef enum NodeType {
 	NODE_HAIR_INFO,
 	NODE_UVMAP,
 	NODE_TEX_VOXEL,
-} NodeType;
+} ShaderNodeType;

 typedef enum NodeAttributeType {
 	NODE_ATTR_FLOAT = 0,