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

Fix #129247: GPv3: Removing material doesn't remap some materials correctly

Browse Source 
The issue was that the code that remaps the materials for when
a slot is removed was returning when the `material_index` attribute
didn't exist instead of continuing the loop over all drawings.

This issue was present both in `BKE_grease_pencil_material_remap`
and `BKE_grease_pencil_material_index_remove`
but `BKE_grease_pencil_material_remap` forced the `material_index`
attribute to be created, which meant that the early return
was never hit.

The fix fixes both issues:
* Continue instead of return.
* Don't create the `material_index` attribute in `BKE_grease_pencil_material_remap`
  if it doesn't exist.

Pull Request: https://projects.blender.org/blender/blender/pulls/129288
This commit is contained in:
Falk David
2024-10-21 14:11:11 +02:00
committed by Falk David
parent b05e9f7bd6
commit 83e562aad4
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/blenkernel/intern/grease_pencil.cc
View File

@@ -2483,11 +2483,12 @@ void BKE_grease_pencil_material_remap(GreasePencil *grease_pencil, const uint *r
}
greasepencil::Drawing &drawing = reinterpret_cast<GreasePencilDrawing *>(base)->wrap();
MutableAttributeAccessor attributes = drawing.strokes_for_write().attributes_for_write();
SpanAttributeWriter<int> material_indices = attributes.lookup_or_add_for_write_span<int>(
"material_index", AttrDomain::Curve);
SpanAttributeWriter<int> material_indices = attributes.lookup_for_write_span<int>(
"material_index");
if (!material_indices) {
return;
continue;
}
BLI_assert(material_indices.domain == AttrDomain::Curve);
for (const int i : material_indices.span.index_range()) {
BLI_assert(blender::IndexRange(totcol).contains(remap[material_indices.span[i]]));
UNUSED_VARS_NDEBUG(totcol);
@@ -2497,7 +2498,7 @@ void BKE_grease_pencil_material_remap(GreasePencil *grease_pencil, const uint *r
}
}
void BKE_grease_pencil_material_index_remove(GreasePencil *grease_pencil, int index)
void BKE_grease_pencil_material_index_remove(GreasePencil *grease_pencil, const int index)
{
using namespace blender;
using namespace blender::bke;
@@ -2506,21 +2507,19 @@ void BKE_grease_pencil_material_index_remove(GreasePencil *grease_pencil, int in
if (base->type != GP_DRAWING) {
continue;
}
greasepencil::Drawing &drawing = reinterpret_cast<GreasePencilDrawing *>(base)->wrap();
MutableAttributeAccessor attributes = drawing.strokes_for_write().attributes_for_write();
AttributeWriter<int> material_indices = attributes.lookup_for_write<int>("material_index");
SpanAttributeWriter<int> material_indices = attributes.lookup_for_write_span<int>(
"material_index");
if (!material_indices) {
return;
continue;
}
MutableVArraySpan<int> indices_span(material_indices.varray);
for (const int i : indices_span.index_range()) {
if (indices_span[i] > 0 && indices_span[i] >= index) {
indices_span[i]--;
BLI_assert(material_indices.domain == AttrDomain::Curve);
for (const int i : material_indices.span.index_range()) {
if (material_indices.span[i] > 0 && material_indices.span[i] >= index) {
material_indices.span[i]--;
}
}
indices_span.save();
material_indices.finish();
}
}