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 +15 -2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1328468881 - Show all commits

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

@ -14,6 +14,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_curves_types.h"
#include "DNA_gpencil_legacy_types.h"
#include "DNA_lattice_types.h"
#include "DNA_mesh_types.h"
@ -440,7 +441,7 @@ bool BKE_id_supports_vertex_groups(const ID *id)
if (id == nullptr) {
return false;
}
return ELEM(GS(id->name), ID_ME, ID_LT, ID_GD_LEGACY);
return ELEM(GS(id->name), ID_ME, ID_LT, ID_GD_LEGACY, ID_CV);
}
bool BKE_object_supports_vertex_groups(const Object *ob)
@ -465,6 +466,10 @@ const ListBase *BKE_id_defgroup_list_get(const ID *id)
const bGPdata *gpd = (const bGPdata *)id;
return &gpd->vertex_group_names;
}
case ID_CV: {
const Curves *curves_id = reinterpret_cast<const Curves *>(id);
return &curves_id->geometry.vertex_group_names;
}
default: {
BLI_assert_unreachable();
}
@ -488,6 +493,13 @@ static const int *object_defgroup_active_index_get_p(const Object *ob)
const bGPdata *gpd = (const bGPdata *)ob->data;
return &gpd->vertex_group_active_index;
}
case OB_CURVES: {
const Curves *curves_id = static_cast<const Curves *>(ob->data);
filedescriptor marked this conversation as resolved Outdated
Hans Goudey commented 2023-09-25 18:37:14 +02:00
Outdated
Review
Copy Link

Remove ID_CV and OB_CURVES from these, since we don't want to expose curves object vertex groups right now.

Remove `ID_CV` and `OB_CURVES` from these, since we don't want to expose curves object vertex groups right now.
return &curves_id->geometry.vertex_group_active_index;
}
default: {
BLI_assert_unreachable();
}
}
return nullptr;
}

3
source/blender/makesdna/DNA_object_types.h
View File

@ -599,7 +599,8 @@ typedef enum ObjectType {
OB_POINTCLOUD, \
OB_VOLUME, \
OB_GREASE_PENCIL))
#define OB_TYPE_SUPPORT_VGROUP(_type) (ELEM(_type, OB_MESH, OB_LATTICE, OB_GPENCIL_LEGACY))
#define OB_TYPE_SUPPORT_VGROUP(_type) \
(ELEM(_type, OB_MESH, OB_LATTICE, OB_GPENCIL_LEGACY, OB_CURVES))
#define OB_TYPE_SUPPORT_EDITMODE(_type) \
(ELEM(_type, \
OB_MESH, \