From eb2e4577f4c763bf79a0a139d5c20c810b954185 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Sat, 27 Dec 2014 00:08:58 +0100 Subject: Only add a fill brush to default .blend if there isn't one already. For some reason this happened twice here. Likely candidate for 2.73 final --- source/blender/blenloader/intern/versioning_defaults.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 4732f8578ed..4c7b011097b 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -138,9 +138,13 @@ void BLO_update_defaults_startup_blend(Main *bmain) { Brush *br; - br = BKE_brush_add(bmain, "Fill"); - br->imagepaint_tool = PAINT_TOOL_FILL; - br->ob_mode = OB_MODE_TEXTURE_PAINT; + + br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Fill"); + if (!br) { + br = BKE_brush_add(bmain, "Fill"); + br->imagepaint_tool = PAINT_TOOL_FILL; + br->ob_mode = OB_MODE_TEXTURE_PAINT; + } br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Mask"); if (br) { -- cgit v1.2.3