diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-21 02:40:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-03 14:20:26 +0300 |
| commit | f9ea097a872290d20cd94504adb3172165cb770d (patch) | |
| tree | 1560b65cd6b5077e8690b26bb4b2f2ff251ff358 /source/blender/makesdna/DNA_node_types.h | |
| parent | 37beac8eb823bd81b411426bfc8718639577b179 (diff) | |
Cycles: add Vector Displacement node and extend Displacement node.
This adds midlevel and object/world space for displacement, and a
vector displacement node with tangent/object/world space, midlevel
and scale.
Note that tangent space vector displacement still is not exactly
compatible with maps created by other software, this will require
changes to the tangent computation.
Differential Revision: https://developer.blender.org/D1734
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index e6bc315b728..4dbf3a354ce 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -1029,12 +1029,12 @@ typedef struct NodeSunBeams { #define SHD_TANGENT_AXIS_Y 1 #define SHD_TANGENT_AXIS_Z 2 -/* normal map space */ -#define SHD_NORMAL_MAP_TANGENT 0 -#define SHD_NORMAL_MAP_OBJECT 1 -#define SHD_NORMAL_MAP_WORLD 2 -#define SHD_NORMAL_MAP_BLENDER_OBJECT 3 -#define SHD_NORMAL_MAP_BLENDER_WORLD 4 +/* normal map, displacement space */ +#define SHD_SPACE_TANGENT 0 +#define SHD_SPACE_OBJECT 1 +#define SHD_SPACE_WORLD 2 +#define SHD_SPACE_BLENDER_OBJECT 3 +#define SHD_SPACE_BLENDER_WORLD 4 /* math node clamp */ #define SHD_MATH_CLAMP 1 |