diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-07 20:47:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 18:29:24 +0300 |
| commit | ec51175f1fd6c91d53b0d24daccfd5cc9bddf59d (patch) | |
| tree | 1ad5b06b2318998cc4f03d78a8e7b1ce38e7cbf3 /intern/cycles/kernel | |
| parent | 841d008b98de5d0fa106ff3fa4731be63fc29f9a (diff) | |
Code refactor: add generic Cycles node infrastructure.
Differential Revision: https://developer.blender.org/D2016
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index b10ec588757..9cf4f2d759a 100644 --- 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 diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index 21b0cb15a4f..8c69c589ebb 100644 --- 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, |