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/makesrna/intern/rna_nodetree.c | |
| parent | efe289f3121f1eb9a7d85520cf5bfaeed88bcf50 (diff) | |
| parent | ceea98be2f54ed72691a130ea8eed613726e4521 (diff) | |
svn merge ^/trunk/blender -r47253:47272
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 8604fa0ef31..1f574ba2473 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1994,8 +1994,9 @@ static void def_cmp_dilate_erode(StructRNA *srna) PropertyRNA *prop; static EnumPropertyItem type_items[] = { - {CMP_NODE_DILATEERODE_STEP, "STEP", 0, "Step", ""}, - {CMP_NODE_DILATEERODE_DISTANCE, "DISTANCE", 0, "Distance", ""}, + {CMP_NODE_DILATEERODE_STEP, "STEP", 0, "Step", ""}, + {CMP_NODE_DILATEERODE_DISTANCE_THRESH, "THRESHOLD", 0, "Threshold", ""}, + {CMP_NODE_DILATEERODE_DISTANCE, "DISTANCE", 0, "Distance", ""}, {0, NULL, 0, NULL, NULL} }; |