Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-08-01 07:29:15 +0300
committerHans Goudey <h.goudey@me.com>2022-08-01 07:29:15 +0300
commit29c68895b0534f505fe628b96929f674991cd5af (patch)
tree95e21d7562cad01ef0eef2a139522f836de06323 /source/blender/modifiers/intern
parent94ce0ac547f685fbf2d8c5375ab2e1f80adaef05 (diff)
Fix modifiers test
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r--source/blender/modifiers/intern/MOD_mask.cc4
-rw-r--r--source/blender/modifiers/intern/MOD_skin.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc
index 70e3d4528ce..4c7c59dc265 100644
--- a/source/blender/modifiers/intern/MOD_mask.cc
+++ b/source/blender/modifiers/intern/MOD_mask.cc
@@ -467,7 +467,7 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh,
int polys_masked_num)
{
const Span<MPoly> src_polygons = blender::bke::mesh_polygons(src_mesh);
- const Span<MLoop> src_loops = blender::bke::mesh_loops(dst_mesh);
+ const Span<MLoop> src_loops = blender::bke::mesh_loops(src_mesh);
MutableSpan<MPoly> dst_polygons = blender::bke::mesh_polygons_for_write(dst_mesh);
MutableSpan<MLoop> dst_loops = blender::bke::mesh_loops_for_write(dst_mesh);
@@ -508,7 +508,7 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh,
int edges_add_num)
{
const Span<MPoly> src_polygons = blender::bke::mesh_polygons(src_mesh);
- const Span<MLoop> src_loops = blender::bke::mesh_loops(dst_mesh);
+ const Span<MLoop> src_loops = blender::bke::mesh_loops(src_mesh);
MutableSpan<MEdge> dst_edges = blender::bke::mesh_edges_for_write(dst_mesh);
MutableSpan<MPoly> dst_polygons = blender::bke::mesh_polygons_for_write(dst_mesh);
MutableSpan<MLoop> dst_loops = blender::bke::mesh_loops_for_write(dst_mesh);
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 10f2c3689f0..9d0df11ee88 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -919,7 +919,10 @@ static Mesh *subdivide_base(const Mesh *orig)
MVert *outvert = BKE_mesh_vertices_for_write(result);
MEdge *outedge = BKE_mesh_edges_for_write(result);
MVertSkin *outnode = CustomData_get_layer(&result->vdata, CD_MVERT_SKIN);
- MDeformVert *outdvert = BKE_mesh_deform_verts_for_write(result);
+ MDeformVert *outdvert = NULL;
+ if (origdvert) {
+ outdvert = BKE_mesh_deform_verts_for_write(result);
+ }
/* Copy original vertex data */
CustomData_copy_data(&orig->vdata, &result->vdata, 0, 0, orig_vert_num);