diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-03 18:10:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-03 18:10:01 +0300 |
| commit | 1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (patch) | |
| tree | a24e6f88aee2a999b187dd416bef941af6450677 /source/blender/makesdna/DNA_node_types.h | |
| parent | 065a84c8d0d68edece9a407dbe97828fe22d3a6f (diff) | |
| parent | db989e1f118071aae6dcd9f29d10182bd5ebed0b (diff) | |
Merge branch 'master' into blender2.8
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 0bd36244ffb..bddbf63d8b1 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -1032,12 +1032,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 |