dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #120920: Can not edit strokes/points when materials array is empty

Browse Source 
Return entire points/curves range if object has no material.

Pull Request: https://projects.blender.org/blender/blender/pulls/120923
This commit is contained in:
Pratik Borhade
2024-04-22 13:04:15 +02:00
committed by Falk David
parent 43cd394832
commit f4894c098f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc
+13 -4
View File
@@ -544,6 +544,12 @@ IndexMask retrieve_editable_strokes(Object &object,
IndexMaskMemory &memory)
{
using namespace blender;
const bke::CurvesGeometry &curves = drawing.strokes();
const IndexRange curves_range = drawing.strokes().curves_range();
if (object.totcol == 0) {
return IndexMask(curves_range);
}
/* Get all the editable material indices */
VectorSet<int> editable_material_indices = get_editable_material_indices(object);
@@ -551,8 +557,6 @@ IndexMask retrieve_editable_strokes(Object &object,
return {};
}
const bke::CurvesGeometry &curves = drawing.strokes();
const IndexRange curves_range = drawing.strokes().curves_range();
const bke::AttributeAccessor attributes = curves.attributes();
const VArray<int> materials = *attributes.lookup<int>("material_index", bke::AttrDomain::Curve);
@@ -611,14 +615,19 @@ IndexMask retrieve_editable_points(Object &object,
const bke::greasepencil::Drawing &drawing,
IndexMaskMemory &memory)
{
const bke::CurvesGeometry &curves = drawing.strokes();
const IndexRange points_range = drawing.strokes().points_range();
if (object.totcol == 0) {
return IndexMask(points_range);
}
/* Get all the editable material indices */
VectorSet<int> editable_material_indices = get_editable_material_indices(object);
if (editable_material_indices.is_empty()) {
return {};
}
const bke::CurvesGeometry &curves = drawing.strokes();
const IndexRange points_range = drawing.strokes().points_range();
const bke::AttributeAccessor attributes = curves.attributes();
/* Propagate the material index to the points. */