griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #146153: Sculpt tools do not work after duplicating scene

Browse Source 
Introduced with 7f3aa617ce

The `PaintMode` is needed when activating the default tool. There were
two things that caused this field on the `PaintRuntime` to be in an
invalid state on duplication:

* The original values for `PaintRuntime` were not copied to the new
  instance.
* When copying `ToolSettings`, the incorrect old value of `Paint` was
  passed to `BKE_paint_copy`, leading to the inability to copy the right
  data.

Pull Request: https://projects.blender.org/blender/blender/pulls/146199
This commit is contained in:
Sean Kim
2025-09-14 09:37:48 +02:00
committed by Sean Kim
parent a9a54c88b9
commit 1104c69a0e
2 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/paint.cc
View File

@@ -1911,6 +1911,9 @@ void BKE_paint_copy(const Paint *src, Paint *dst, const int flag)
}
dst->runtime = MEM_new<blender::bke::PaintRuntime>(__func__);
dst->runtime->paint_mode = src->runtime->paint_mode;
dst->runtime->ob_mode = src->runtime->ob_mode;
dst->runtime->initialized = true;
}
void BKE_paint_settings_foreach_mode(ToolSettings *ts, blender::FunctionRef<void(Paint *paint)> fn)

80
source/blender/blenkernel/intern/scene.cc
View File

@@ -1599,77 +1599,79 @@ ToolSettings *BKE_toolsettings_copy(ToolSettings *toolsettings, const int flag)
return nullptr;
}
ToolSettings *ts = static_cast<ToolSettings *>(MEM_dupallocN(toolsettings));
if (ts->vpaint) {
ts->vpaint = static_cast<VPaint *>(MEM_dupallocN(ts->vpaint));
BKE_paint_copy(&ts->vpaint->paint, &ts->vpaint->paint, flag);
if (toolsettings->vpaint) {
ts->vpaint = static_cast<VPaint *>(MEM_dupallocN(toolsettings->vpaint));
BKE_paint_copy(&toolsettings->vpaint->paint, &ts->vpaint->paint, flag);
}
if (ts->wpaint) {
ts->wpaint = static_cast<VPaint *>(MEM_dupallocN(ts->wpaint));
BKE_paint_copy(&ts->wpaint->paint, &ts->wpaint->paint, flag);
if (toolsettings->wpaint) {
ts->wpaint = static_cast<VPaint *>(MEM_dupallocN(toolsettings->wpaint));
BKE_paint_copy(&toolsettings->wpaint->paint, &ts->wpaint->paint, flag);
}
if (ts->sculpt) {
ts->sculpt = static_cast<Sculpt *>(MEM_dupallocN(ts->sculpt));
BKE_paint_copy(&ts->sculpt->paint, &ts->sculpt->paint, flag);
if (toolsettings->sculpt) {
ts->sculpt = static_cast<Sculpt *>(MEM_dupallocN(toolsettings->sculpt));
BKE_paint_copy(&toolsettings->sculpt->paint, &ts->sculpt->paint, flag);
if (ts->sculpt->automasking_cavity_curve) {
if (toolsettings->sculpt->automasking_cavity_curve) {
ts->sculpt->automasking_cavity_curve = BKE_curvemapping_copy(
ts->sculpt->automasking_cavity_curve);
toolsettings->sculpt->automasking_cavity_curve);
BKE_curvemapping_init(ts->sculpt->automasking_cavity_curve);
}
if (ts->sculpt->automasking_cavity_curve_op) {
if (toolsettings->sculpt->automasking_cavity_curve_op) {
ts->sculpt->automasking_cavity_curve_op = BKE_curvemapping_copy(
ts->sculpt->automasking_cavity_curve_op);
toolsettings->sculpt->automasking_cavity_curve_op);
BKE_curvemapping_init(ts->sculpt->automasking_cavity_curve_op);
}
}
if (ts->uvsculpt.strength_curve) {
ts->uvsculpt.strength_curve = BKE_curvemapping_copy(ts->uvsculpt.strength_curve);
if (toolsettings->uvsculpt.strength_curve) {
ts->uvsculpt.strength_curve = BKE_curvemapping_copy(toolsettings->uvsculpt.strength_curve);
BKE_curvemapping_init(ts->uvsculpt.strength_curve);
}
if (ts->gp_paint) {
ts->gp_paint = static_cast<GpPaint *>(MEM_dupallocN(ts->gp_paint));
BKE_paint_copy(&ts->gp_paint->paint, &ts->gp_paint->paint, flag);
if (toolsettings->gp_paint) {
ts->gp_paint = static_cast<GpPaint *>(MEM_dupallocN(toolsettings->gp_paint));
BKE_paint_copy(&toolsettings->gp_paint->paint, &ts->gp_paint->paint, flag);
}
if (ts->gp_vertexpaint) {
ts->gp_vertexpaint = static_cast<GpVertexPaint *>(MEM_dupallocN(ts->gp_vertexpaint));
BKE_paint_copy(&ts->gp_vertexpaint->paint, &ts->gp_vertexpaint->paint, flag);
if (toolsettings->gp_vertexpaint) {
ts->gp_vertexpaint = static_cast<GpVertexPaint *>(MEM_dupallocN(toolsettings->gp_vertexpaint));
BKE_paint_copy(&toolsettings->gp_vertexpaint->paint, &ts->gp_vertexpaint->paint, flag);
}
if (ts->gp_sculptpaint) {
ts->gp_sculptpaint = static_cast<GpSculptPaint *>(MEM_dupallocN(ts->gp_sculptpaint));
BKE_paint_copy(&ts->gp_sculptpaint->paint, &ts->gp_sculptpaint->paint, flag);
if (toolsettings->gp_sculptpaint) {
ts->gp_sculptpaint = static_cast<GpSculptPaint *>(MEM_dupallocN(toolsettings->gp_sculptpaint));
BKE_paint_copy(&toolsettings->gp_sculptpaint->paint, &ts->gp_sculptpaint->paint, flag);
}
if (ts->gp_weightpaint) {
ts->gp_weightpaint = static_cast<GpWeightPaint *>(MEM_dupallocN(ts->gp_weightpaint));
BKE_paint_copy(&ts->gp_weightpaint->paint, &ts->gp_weightpaint->paint, flag);
if (toolsettings->gp_weightpaint) {
ts->gp_weightpaint = static_cast<GpWeightPaint *>(MEM_dupallocN(toolsettings->gp_weightpaint));
BKE_paint_copy(&toolsettings->gp_weightpaint->paint, &ts->gp_weightpaint->paint, flag);
}
if (ts->curves_sculpt) {
ts->curves_sculpt = static_cast<CurvesSculpt *>(MEM_dupallocN(ts->curves_sculpt));
BKE_paint_copy(&ts->curves_sculpt->paint, &ts->curves_sculpt->paint, flag);
if (toolsettings->curves_sculpt) {
ts->curves_sculpt = static_cast<CurvesSculpt *>(MEM_dupallocN(toolsettings->curves_sculpt));
BKE_paint_copy(&toolsettings->curves_sculpt->paint, &ts->curves_sculpt->paint, flag);
}
/* Color jitter curves in unified paint settings. */
ts->unified_paint_settings.curve_rand_hue = BKE_curvemapping_copy(
ts->unified_paint_settings.curve_rand_hue);
toolsettings->unified_paint_settings.curve_rand_hue);
ts->unified_paint_settings.curve_rand_saturation = BKE_curvemapping_copy(
ts->unified_paint_settings.curve_rand_saturation);
toolsettings->unified_paint_settings.curve_rand_saturation);
ts->unified_paint_settings.curve_rand_value = BKE_curvemapping_copy(
ts->unified_paint_settings.curve_rand_value);
toolsettings->unified_paint_settings.curve_rand_value);
BKE_paint_copy(&ts->imapaint.paint, &ts->imapaint.paint, flag);
BKE_paint_copy(&toolsettings->imapaint.paint, &ts->imapaint.paint, flag);
ts->particle.paintcursor = nullptr;
ts->particle.scene = nullptr;
ts->particle.object = nullptr;
/* duplicate Grease Pencil interpolation curve */
ts->gp_interpolate.custom_ipo = BKE_curvemapping_copy(ts->gp_interpolate.custom_ipo);
ts->gp_interpolate.custom_ipo = BKE_curvemapping_copy(toolsettings->gp_interpolate.custom_ipo);
/* Duplicate Grease Pencil multi-frame falloff. */
ts->gp_sculpt.cur_falloff = BKE_curvemapping_copy(ts->gp_sculpt.cur_falloff);
ts->gp_sculpt.cur_primitive = BKE_curvemapping_copy(ts->gp_sculpt.cur_primitive);
ts->gp_sculpt.cur_falloff = BKE_curvemapping_copy(toolsettings->gp_sculpt.cur_falloff);
ts->gp_sculpt.cur_primitive = BKE_curvemapping_copy(toolsettings->gp_sculpt.cur_primitive);
ts->custom_bevel_profile_preset = BKE_curveprofile_copy(ts->custom_bevel_profile_preset);
ts->custom_bevel_profile_preset = BKE_curveprofile_copy(
toolsettings->custom_bevel_profile_preset);
ts->sequencer_tool_settings = blender::seq::tool_settings_copy(ts->sequencer_tool_settings);
ts->sequencer_tool_settings = blender::seq::tool_settings_copy(
toolsettings->sequencer_tool_settings);
return ts;
}