blender/blender
142
451
Fork 651
Code Issues 6.5k Pull Requests 823 Projects 18 Wiki Activity

CurvesGeometry: Add initial vertex group support #106944

Merged
Falk David merged 24 commits from filedescriptor/blender:curves-deform-verts into main 2023-09-27 10:26:16 +02:00
Conversation 3 Commits 24 Files Changed 7 +6 -4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa4f47d2bf - Show all commits

4
source/blender/blenkernel/BKE_deform.h
View File

@ -7,6 +7,7 @@
#ifdef __cplusplus
# include "BLI_math_vector_types.hh"
# include "BLI_offset_indices.hh"
# include "BLI_virtual_array.hh"
#endif
#ifdef __cplusplus
@ -298,7 +299,8 @@ void BKE_defvert_extract_vgroup_to_faceweights(const struct MDeformVert *dvert,
namespace blender::bke {
VArray<float> varray_for_deform_verts(Span<MDeformVert> dverts, const int dvert_index);
filedescriptor marked this conversation as resolved Outdated
Hans Goudey commented 2023-09-25 18:35:05 +02:00
Outdated
Review
Copy Link
  • const int -> int
  • dvert_index -> defgroup_index/vgroup_index
- `const int` -> `int` - `dvert_index` -> `defgroup_index`/`vgroup_index`
VMutableArray<float> varray_for_deform_verts(MutableSpan<MDeformVert> dverts, int dvert_index);
VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dverts,
int dvert_index);
} // namespace blender::bke
#endif

2
source/blender/blenkernel/intern/deform.cc
View File

@ -1770,7 +1770,7 @@ VArray<float> varray_for_deform_verts(Span<MDeformVert> dverts, const int dvert_
{
return VArray<float>::For<VArrayImpl_For_VertexWeights>(dverts, dvert_index);
}
VMutableArray<float> varray_for_deform_verts(MutableSpan<MDeformVert> dverts, const int dvert_index)
VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dverts, const int dvert_index)
{
return VMutableArray<float>::For<VArrayImpl_For_VertexWeights>(dverts, dvert_index);
}

2
source/blender/blenkernel/intern/geometry_component_curves.cc
View File

@ -377,7 +377,7 @@ class CurvesVertexGroupsAttributeProvider final : public DynamicAttributesProvid
return {};
}
MutableSpan<MDeformVert> dverts = curves->deform_verts_for_write();
return {bke::varray_for_deform_verts(dverts, vertex_group_index), ATTR_DOMAIN_POINT};
return {bke::varray_for_mutable_deform_verts(dverts, vertex_group_index), ATTR_DOMAIN_POINT};
}
bool try_delete(void *owner, const AttributeIDRef &attribute_id) const final

2
source/blender/blenkernel/intern/geometry_component_mesh.cc
View File

@ -904,7 +904,7 @@ class MeshVertexGroupsAttributeProvider final : public DynamicAttributesProvider
return {};
}
MutableSpan<MDeformVert> dverts = mesh->deform_verts_for_write();
return {bke::varray_for_deform_verts(dverts, vertex_group_index), ATTR_DOMAIN_POINT};
return {bke::varray_for_mutable_deform_verts(dverts, vertex_group_index), ATTR_DOMAIN_POINT};
}
bool try_delete(void *owner, const AttributeIDRef &attribute_id) const final