diff options
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index b4e12484bdc..6b46c5887b4 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -876,10 +876,10 @@ typedef struct NodeTexNoise { typedef struct NodeTexVoronoi { NodeTexBase base; - int coloring; - int distance; + int dimensions; int feature; - char _pad[4]; + int distance; + int coloring DNA_DEPRECATED; } NodeTexVoronoi; typedef struct NodeTexMusgrave { @@ -1098,20 +1098,22 @@ typedef struct NodeDenoise { #define SHD_NOISE_SOFT 0 #define SHD_NOISE_HARD 1 -/* voronoi texture */ -#define SHD_VORONOI_DISTANCE 0 -#define SHD_VORONOI_MANHATTAN 1 -#define SHD_VORONOI_CHEBYCHEV 2 -#define SHD_VORONOI_MINKOWSKI 3 +/* Voronoi Texture */ -#define SHD_VORONOI_INTENSITY 0 -#define SHD_VORONOI_CELLS 1 +enum { + SHD_VORONOI_EUCLIDEAN = 0, + SHD_VORONOI_MANHATTAN = 1, + SHD_VORONOI_CHEBYCHEV = 2, + SHD_VORONOI_MINKOWSKI = 3, +}; -#define SHD_VORONOI_F1 0 -#define SHD_VORONOI_F2 1 -#define SHD_VORONOI_F3 2 -#define SHD_VORONOI_F4 3 -#define SHD_VORONOI_F2F1 4 +enum { + SHD_VORONOI_F1 = 0, + SHD_VORONOI_F2 = 1, + SHD_VORONOI_SMOOTH_F1 = 2, + SHD_VORONOI_DISTANCE_TO_EDGE = 3, + SHD_VORONOI_N_SPHERE_RADIUS = 4, +}; /* musgrave texture */ #define SHD_MUSGRAVE_MULTIFRACTAL 0 |