diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
| commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
| tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/makesrna | |
| parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
| parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index f79ff4486dd..db86bda41ff 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -489,7 +489,7 @@ static void rna_Brush_set_unprojected_radius(PointerRNA *ptr, float value) static EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); static EnumPropertyItem prop_default_items[] = { {0, NULL, 0, NULL, NULL} @@ -595,7 +595,7 @@ static EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA *ptr, static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); static EnumPropertyItem brush_stroke_method_items[] = { {0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"}, |