blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Antonio Vazquez 2020-04-16 15:57:37 +02:00
parent 816597d6da a9dd6d004b
commit a1420da027
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenloader/intern/versioning_280.c
View File

@ -1666,6 +1666,19 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports))
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
BKE_fcurves_id_cb(&ob->id, do_version_fcurve_hide_viewport_fix, NULL);
}
/* Reset all grease pencil brushes. */
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
BKE_brush_gpencil_paint_presets(bmain, scene->toolsettings);
BKE_brush_gpencil_sculpt_presets(bmain, scene->toolsettings);
BKE_brush_gpencil_weight_presets(bmain, scene->toolsettings);
BKE_brush_gpencil_vertex_presets(bmain, scene->toolsettings);
/* Ensure new Paint modes. */
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_VERTEX_GPENCIL);
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_SCULPT_GPENCIL);
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_WEIGHT_GPENCIL);
}
}
/**