diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
| commit | 15cb47bf91820aac3a3881e94378067472c07e1b (patch) | |
| tree | f8db8dd34c6a0b660ad1816e002c9ef3af939b00 /source/blender/makesrna/intern/rna_dynamicpaint.c | |
| parent | 9de082dbf4130b48d59e673ed276a046d97cc1e4 (diff) | |
| parent | bc788a3607eda1889c7f0fe2201116826a9394ee (diff) | |
Merge with trunk r40409
Diffstat (limited to 'source/blender/makesrna/intern/rna_dynamicpaint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_dynamicpaint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index 0aa1c8f8aff..f53213f0a46 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -686,7 +686,7 @@ static void rna_def_dynamic_paint_brush_settings(BlenderRNA *brna) static EnumPropertyItem prop_dynamicpaint_prox_falloff[] = { {MOD_DPAINT_PRFALL_SMOOTH, "SMOOTH", ICON_SPHERECURVE, "Smooth", ""}, - {MOD_DPAINT_PRFALL_SHARP, "SHARP", ICON_NOCURVE, "Sharp", ""}, + {MOD_DPAINT_PRFALL_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", ""}, {MOD_DPAINT_PRFALL_RAMP, "RAMP", ICON_COLOR, "Color Ramp", ""}, {0, NULL, 0, NULL, NULL}}; |