Details

Reviewers

Maniphest Tasks

T88334: Failure to preserve vertex groups through Geometry Nodes, new to 2.93
T88951: Move vertex group names from object to geometry

Commits

rB3b6ee8cee708: Refactor: Move vertex group names to object data

Summary

This commit moves the storage of bDeformGroup and the active index
to Mesh, Lattice, and bGPdata instead of Object.

As explained in T88951, the list of vertex group names is currently
stored separately per object, even though vertex group data is stored
on the geometry. This tends to complicate code and cause bugs,
especially as geometry is created procedurally and tied less closely
to objects.

The "Copy Vertex Groups to Linked" operator is removed, since they
are stored on the geometry anyway.

This patch leaves the object-level python API for vertex groups in place.
Creating a geometry-level RNA API can be a separate step, the changes
here are invasive enough as it is.

Diff Detail

Repository

rB Blender

Branch

refactor-vertex-group-names (branched from master)

Build Status

Buildable 15392
Build 15392: arc lint + arc unit

Event Timeline

Hans Goudey (HooglyBoogly) requested review of this revision.Jun 24 2021, 12:42 AM

Hans Goudey (HooglyBoogly) created this revision.

Harbormaster completed remote builds in B15392: Diff 38683.Jun 24 2021, 12:42 AM

Add comments, minor cleanup, remove debug statements

Harbormaster completed remote builds in B15393: Diff 38684.Jun 24 2021, 12:58 AM

Hans Goudey (HooglyBoogly) added a task: T88951: Move vertex group names from object to geometry.Jun 24 2021, 12:58 AM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)

Fix unused variable warning

Harbormaster completed remote builds in B15398: Diff 38689.Jun 24 2021, 5:08 AM

Hans Goudey (HooglyBoogly) mentioned this in D11659: Fix T89316: Boolean node does not transfer vertex group names..Jun 24 2021, 5:22 AM

Hans Goudey (HooglyBoogly) added a task: T88334: Failure to preserve vertex groups through Geometry Nodes, new to 2.93.Jun 24 2021, 5:25 AM

RedMser (RedMser) added a subscriber: RedMser (RedMser).Jun 24 2021, 10:04 AM

Move active index to geometry
Add small API to retrieve vertex group indices and lists from an ID

Harbormaster completed remote builds in B15509: Diff 38932.Jun 29 2021, 11:42 PM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)Jun 29 2021, 11:45 PM

Hans Goudey (HooglyBoogly) added a project: Geometry Nodes.

Merge branch 'master' into refactor-vertex-group-names
More fixes and cleanup
Fix issue with modifier vertex group utility-- tests pass

Harbormaster completed remote builds in B15577: Diff 39072.Jul 3 2021, 5:50 AM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)Jul 3 2021, 5:50 AM

Merge branch 'master' into refactor-vertex-group-names

Harbormaster completed remote builds in B15610: Diff 39147.Jul 5 2021, 3:28 PM

Hans Goudey (HooglyBoogly) retitled this revision from Refactor: Move vertex group names to object data (WIP) to Refactor: Move vertex group names to object data.Jul 5 2021, 3:29 PM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)

Hans Goudey (HooglyBoogly) added a reviewer: Jacques Lucke (JacquesLucke).

Share implementation of vertex group retrieval
Rename functions "for_read" -> "" and "for_write" -> "mutable"

Harbormaster completed remote builds in B15620: Diff 39164.Jul 5 2021, 5:28 PM

Looks all very straight forward, good job!
Got a few minor comments, but those should be easy to fix.

Ideally at least one other dev should have a quick look at this. Also maybe @Demeter Dzadik (Mets) can check if this breaks production files?

source/blender/blenkernel/intern/deform.c
538	Implement this in terms of `BKE_id_defgroup_list_get`.
585	This and the function above can share code by extracting a `int *BKE_object_defgroup_active_index_p(...)` function.
source/blender/blenkernel/intern/lattice_deform.c
367 ↗	(On Diff #39147)	Can just cast to `ID *` directly.
source/blender/blenkernel/intern/mesh.c
938	Under what circumstances is this copied already? Would it make sense to always clear and copy the list?
source/blender/editors/gpencil/gpencil_fill.c
1527	Could you use `tgpf->gpd->...` directly?
source/blender/editors/object/object_vgroup.c
2845–2846	Don't call `BKE_object_defgroup_active_index_get` twice.
source/blender/makesdna/DNA_object_types.h
61	Reminder that there is this todo comment. I don't think it's super urgent to move this now. If you wanted to move it, you'd probably have to move it to a new file.
283	Leave a comment saying this has been moved to the object data.

This revision is now accepted and ready to land.Jul 5 2021, 6:21 PM

Safer RNA object vertex group API (should fix issues reported by @Demeter Dzadik (Mets), thanks!)

Harbormaster completed remote builds in B15624: Diff 39173.Jul 5 2021, 8:15 PM

Hans Goudey (HooglyBoogly) marked 8 inline comments as done.Jul 5 2021, 8:58 PM

Hans Goudey (HooglyBoogly) added inline comments.

source/blender/blenkernel/intern/mesh.c
938	The newly added `BKE_id_eval_properties_copy` function does this. The correct thing to do is free the list and then replace it though, I think. I've updated this function to do that.
source/blender/makesdna/DNA_object_types.h
61	Yeah, probably doesn't matter enough to move it.

Fixes from review comments

Harbormaster completed remote builds in B15625: Diff 39174.Jul 5 2021, 8:58 PM

check forward compatibility

Closed by commit rB3b6ee8cee708: Refactor: Move vertex group names to object data (authored by Hans Goudey (HooglyBoogly)). · Explain WhyJul 13 2021, 6:13 PM

This revision was automatically updated to reflect the committed changes.

Hans Goudey (HooglyBoogly) added a commit: rB3b6ee8cee708: Refactor: Move vertex group names to object data.

Duarte Farrajota Ramos (duarteframos) awarded a token.Jul 13 2021, 9:02 PM

Bartosz Moniewski (monio) awarded a token.Jul 13 2021, 11:03 PM

I couldn't find this important change in release notes, so I added it to the Animation & Rigging section.

Scurest (scurest) mentioned this in T92808: Default .glTF importer not importing vertex groups data.Nov 5 2021, 3:06 PM

Alex (SpectreFirst) mentioned this in T94424: Blender 3.x: Local object with linked data loses Vertex Groups.Dec 28 2021, 12:35 AM

Refactor: Move vertex group names to object dataClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 38683

release/scripts/startup/bl_ui/properties_data_mesh.py

source/blender/blenkernel/BKE_blender_version.h

source/blender/blenkernel/BKE_deform.h

source/blender/blenkernel/BKE_geometry_set.hh

source/blender/blenkernel/intern/DerivedMesh.cc

source/blender/blenkernel/intern/armature_deform.c

source/blender/blenkernel/intern/deform.c

source/blender/blenkernel/intern/geometry_component_mesh.cc

source/blender/blenkernel/intern/geometry_set_instances.cc

source/blender/blenkernel/intern/gpencil.c

source/blender/blenkernel/intern/key.c

source/blender/blenkernel/intern/lattice.c

source/blender/blenkernel/intern/mesh.c

source/blender/blenkernel/intern/object.c

source/blender/blenkernel/intern/object_deform.c

source/blender/blenloader/intern/versioning_300.c

source/blender/draw/engines/overlay/overlay_armature.c

source/blender/draw/intern/draw_cache.c

source/blender/draw/intern/draw_cache_impl_gpencil.c

source/blender/draw/intern/draw_cache_impl_mesh.c

source/blender/editors/armature/armature_skinning.c

source/blender/editors/gpencil/gpencil_armature.c

source/blender/editors/gpencil/gpencil_data.c

source/blender/editors/gpencil/gpencil_fill.c

source/blender/editors/gpencil/gpencil_paint.c

source/blender/editors/gpencil/gpencil_primitive.c

source/blender/editors/gpencil/gpencil_sculpt_paint.c

source/blender/editors/gpencil/gpencil_utils.c

source/blender/editors/gpencil/gpencil_weight_paint.c

source/blender/editors/lattice/editlattice_select.c

source/blender/editors/mesh/editmesh_select.c

source/blender/editors/mesh/editmesh_select_similar.c

source/blender/editors/mesh/meshtools.c

source/blender/editors/object/object_data_transfer.c

source/blender/editors/object/object_hook.c

source/blender/editors/object/object_intern.h

source/blender/editors/object/object_ops.c

source/blender/editors/object/object_vgroup.c

source/blender/editors/sculpt_paint/paint_utils.c

source/blender/editors/sculpt_paint/paint_vertex.c

source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c

source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c

source/blender/editors/space_outliner/outliner_tree.c

source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc

source/blender/editors/space_view3d/view3d_buttons.c

source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

source/blender/io/collada/ControllerExporter.h

source/blender/io/collada/ControllerExporter.cpp

source/blender/io/collada/SkinInfo.cpp

source/blender/makesdna/DNA_gpencil_types.h

source/blender/makesdna/DNA_lattice_types.h

source/blender/makesdna/DNA_mesh_types.h

source/blender/makesdna/DNA_object_types.h

source/blender/makesrna/intern/rna_modifier.c

source/blender/makesrna/intern/rna_object.c

source/blender/makesrna/intern/rna_particle.c

source/blender/modifiers/intern/MOD_armature.c

source/blender/modifiers/intern/MOD_mask.cc

source/blender/modifiers/intern/MOD_nodes.cc

source/blender/modifiers/intern/MOD_weightvgedit.c

source/blender/modifiers/intern/MOD_weightvgmix.c

source/blender/modifiers/intern/MOD_weightvgproximity.c

source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc

source/blender/nodes/geometry/nodes/node_geo_subdivide.cc

source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc

Refactor: Move vertex group names to object data
ClosedPublic
Actions

Revision Contents
Changeset List