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

Fix #134289: Grease Pencil: SVG export crashes with no material

Browse Source 
If there's no material in the Grease Pencil object, exporting those
strokes will cause crash because the SVG exporter didn't handle the
case for when there's no material. Now uses black stroke when material
is `nullptr`.

Pull Request: https://projects.blender.org/blender/blender/pulls/134314
This commit is contained in:
YimingWu
2025-02-10 11:54:34 +01:00
committed by Falk David
parent ba83ddfa89
commit bc3c72fd8a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/io/grease_pencil/intern/grease_pencil_io.cc
View File

@@ -179,6 +179,11 @@ static IndexMask get_visible_strokes(const Object &object,
/* Check if the material is visible. */
const Material *material = BKE_object_material_get(const_cast<Object *>(&object),
materials[curve_i] + 1);
if (material == nullptr) {
return false;
}
const MaterialGPencilStyle *gp_style = material ? material->gp_style : nullptr;
const bool is_hidden_material = (gp_style->flag & GP_MATERIAL_HIDE);
const bool is_stroke_material = (gp_style->flag & GP_MATERIAL_STROKE_SHOW);
@@ -461,12 +466,18 @@ void GreasePencilExporter::foreach_stroke_in_layer(const Object &object,
const int material_index = material_indices[i_curve];
const Material *material = BKE_object_material_get(const_cast<Object *>(&object),
material_index + 1);
BLI_assert(material->gp_style != nullptr);
if (material->gp_style->flag & GP_MATERIAL_HIDE) {
continue;
if (material != nullptr) {
BLI_assert(material->gp_style != nullptr);
if (material->gp_style->flag & GP_MATERIAL_HIDE) {
continue;
}
}
const bool is_stroke_material = material->gp_style->flag & GP_MATERIAL_STROKE_SHOW;
const bool is_fill_material = material->gp_style->flag & GP_MATERIAL_FILL_SHOW;
const bool is_stroke_material = material ?
(material->gp_style->flag & GP_MATERIAL_STROKE_SHOW) :
true;
const bool is_fill_material = material ? (material->gp_style->flag & GP_MATERIAL_FILL_SHOW) :
false;
/* Fill. */
if (is_fill_material && params_.export_fill_materials) {
@@ -484,8 +495,9 @@ void GreasePencilExporter::foreach_stroke_in_layer(const Object &object,
/* Stroke. */
if (is_stroke_material && params_.export_stroke_materials) {
const ColorGeometry4f stroke_color = compute_average_stroke_color(
*material, vertex_colors.slice(points));
const ColorGeometry4f stroke_color = material ? compute_average_stroke_color(
*material, vertex_colors.slice(points)) :
ColorGeometry4f(0.0f, 0.0f, 0.0f, 1.0f);
const float stroke_opacity = compute_average_stroke_opacity(opacities.slice(points)) *
layer.opacity;
const std::optional<float> uniform_width = params_.use_uniform_width ?