From 4b742caddce4eb9bae9afa3305e25f702c6ed840 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 13 Nov 2014 11:35:20 +0100 Subject: Fix T42538 Brush cleanup: Some brushes really do the same thing and we have agreed not to offer extra presets for one brush type. Removed those brushes from default .blend. They are Polish (Flatten Contrast does the same), Brush (Does the same as draw) and Draw from texpaint (where texdraw/draw does the same) --- source/blender/blenloader/intern/versioning_defaults.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 1afcac313a2..4732f8578ed 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -147,6 +147,24 @@ void BLO_update_defaults_startup_blend(Main *bmain) br->imagepaint_tool = PAINT_TOOL_MASK; br->ob_mode |= OB_MODE_TEXTURE_PAINT; } + + /* remove polish brush (flatten/contrast does the same) */ + br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Polish"); + if (br) { + BKE_libblock_free(bmain, br); + } + + /* remove brush brush (huh?) from some modes (draw brushes do the same) */ + br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Brush"); + if (br) { + BKE_libblock_free(bmain, br); + } + + /* remove draw brush from texpaint (draw brushes do the same) */ + br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Draw"); + if (br) { + br->ob_mode &= ~OB_MODE_TEXTURE_PAINT; + } } } -- cgit v1.2.3