Merge branch 'blender-v2.83-release'

2020-05-15 16:51:36 +02:00
parent d6e0b55b1c 1cad0a627e
commit 363f18c8b5
11 changed files with 189 additions and 83 deletions
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -463,7 +463,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)

    /* Reset all grease pencil brushes. */
    Scene *scene = bmain->scenes.first;
-    BKE_brush_gpencil_paint_presets(bmain, scene->toolsettings);
+    BKE_brush_gpencil_paint_presets(bmain, scene->toolsettings, true);

    /* Ensure new Paint modes. */
    BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_VERTEX_GPENCIL);