diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 02:08:58 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 02:08:58 +0300 |
| commit | eb2e4577f4c763bf79a0a139d5c20c810b954185 (patch) | |
| tree | 19c13fcacc967d104185e64a6387a775b1505710 /source/blender/blenloader/intern/versioning_defaults.c | |
| parent | c7c10e5e283879961356050ba8a965d2239456b8 (diff) | |
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
Diffstat (limited to 'source/blender/blenloader/intern/versioning_defaults.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 10 |
1 files changed, 7 insertions, 3 deletions
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) { |