Merge branch 'blender-v4.0-release'
This commit is contained in:
commit
106d54554a
|
@ -475,23 +475,37 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reset all grease pencil brushes. */
|
/* Reset all grease pencil brushes. */
|
||||||
Scene *scene = static_cast<Scene *>(bmain->scenes.first);
|
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
|
||||||
BKE_brush_gpencil_paint_presets(bmain, scene->toolsettings, true);
|
ToolSettings *ts = scene->toolsettings;
|
||||||
BKE_brush_gpencil_sculpt_presets(bmain, scene->toolsettings, true);
|
|
||||||
BKE_brush_gpencil_vertex_presets(bmain, scene->toolsettings, true);
|
|
||||||
BKE_brush_gpencil_weight_presets(bmain, scene->toolsettings, true);
|
|
||||||
|
|
||||||
/* Ensure new Paint modes. */
|
if (ts->gp_paint) {
|
||||||
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_VERTEX_GPENCIL);
|
BKE_brush_gpencil_paint_presets(bmain, ts, true);
|
||||||
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_SCULPT_GPENCIL);
|
}
|
||||||
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_WEIGHT_GPENCIL);
|
if (ts->gp_sculptpaint) {
|
||||||
|
BKE_brush_gpencil_sculpt_presets(bmain, ts, true);
|
||||||
|
}
|
||||||
|
if (ts->gp_vertexpaint) {
|
||||||
|
BKE_brush_gpencil_vertex_presets(bmain, ts, true);
|
||||||
|
}
|
||||||
|
if (ts->gp_weightpaint) {
|
||||||
|
BKE_brush_gpencil_weight_presets(bmain, ts, true);
|
||||||
|
}
|
||||||
|
|
||||||
/* Enable cursor. */
|
/* Ensure new Paint modes. */
|
||||||
GpPaint *gp_paint = scene->toolsettings->gp_paint;
|
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_VERTEX_GPENCIL);
|
||||||
gp_paint->paint.flags |= PAINT_SHOW_BRUSH;
|
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_SCULPT_GPENCIL);
|
||||||
|
BKE_paint_ensure_from_paintmode(scene, PAINT_MODE_WEIGHT_GPENCIL);
|
||||||
|
|
||||||
/* Ensure Palette by default. */
|
/* Enable cursor. */
|
||||||
BKE_gpencil_palette_ensure(bmain, scene);
|
if (ts->gp_paint) {
|
||||||
|
ts->gp_paint->paint.flags |= PAINT_SHOW_BRUSH;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure Palette by default. */
|
||||||
|
if (ts->gp_paint) {
|
||||||
|
BKE_gpencil_palette_ensure(bmain, scene);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For builtin templates only. */
|
/* For builtin templates only. */
|
||||||
|
|
Loading…
Reference in New Issue