diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-31 15:58:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-31 15:58:14 +0400 |
commit | 3c194601f47f11f0d8f0c582f01901a089996619 (patch) | |
tree | afd788833650588dd493bd513e0c2d628f8c84dc /source/blender/makesdna/DNA_node_types.h | |
parent | efe289f3121f1eb9a7d85520cf5bfaeed88bcf50 (diff) | |
parent | ceea98be2f54ed72691a130ea8eed613726e4521 (diff) |
svn merge ^/trunk/blender -r47253:47272
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index d605e9ac38f..39f3fda1157 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -350,8 +350,9 @@ typedef struct bNodeSocketValueRGBA { #define CMP_NODE_LENSFLARE_CIRCLE 4 #define CMP_NODE_LENSFLARE_STREAKS 8 -#define CMP_NODE_DILATEERODE_STEP 0 -#define CMP_NODE_DILATEERODE_DISTANCE 1 +#define CMP_NODE_DILATEERODE_STEP 0 +#define CMP_NODE_DILATEERODE_DISTANCE_THRESH 1 +#define CMP_NODE_DILATEERODE_DISTANCE 2 typedef struct NodeFrame { short flag; |