diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-08-12 23:57:46 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-08-12 23:57:46 +0300 |
| commit | 4b93cdc98a5a8df681ea6233f948caf896a54406 (patch) | |
| tree | 113b2a1b1ee2fd15ad5ff37035609bb15a720360 /source/blender/blenloader | |
| parent | 0e2f5614efebde2ee2d24334c08280fffa3ee96c (diff) | |
| parent | db7cfd03b08cbe5a2c986cfebfa4a04d8aa8a40d (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenkernel/intern/gpencil_curve.c
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 631961e342d..df0b2b380fa 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -722,6 +722,14 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) brush->sculpt_tool = SCULPT_TOOL_DRAW_FACE_SETS; } + brush_name = "Multires Displacement Eraser"; + brush = BLI_findstring(&bmain->brushes, brush_name, offsetof(ID, name) + 2); + if (!brush) { + brush = BKE_brush_add(bmain, brush_name, OB_MODE_SCULPT); + id_us_min(&brush->id); + brush->sculpt_tool = SCULPT_TOOL_DISPLACEMENT_ERASER; + } + /* Use the same tool icon color in the brush cursor */ for (brush = bmain->brushes.first; brush; brush = brush->id.next) { if (brush->ob_mode & OB_MODE_SCULPT) { |