ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: Use separate result for mesh joining, fix multires data join

Browse source 
Instead of modifying the active mesh in place, which means we can't
use the size of its data arrays when copying its data, and its caches
are immediately invalidated, copy data to a separate out-of-main
result mesh first. The only downside is that for a moment during
the operator the shape key array sizes will be out of sync with the
mesh size.

Also the custom data for multires layers wasn't copied properly
after the recent refactor that rewrote this code. Take the opportunity
to fix that too.

The motivation for this change is an improvement to copy different
kinds of custom normals properly to the joined mesh, which never
worked since free custom normals were introduced.

This contains a few changes to the expected results in the tests.
Those are edge cases, and the new results make more sense.
This commit is contained in:
Hans Goudey 2025-10-02 13:41:44 -04:00 • committed by Hans Goudey
parent c8302a08e8
commit 340f9d7ff3
4 changed files with 152 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/python/mesh_join.py
View file

@ -58,8 +58,8 @@ class TestMeshJoin(unittest.TestCase):
self.assertEqual(joined_attr.data[0].value, 1)
self.assertEqual(joined_attr.data[1].value, 1)
self.assertEqual(joined_attr.data[2].value, 45)
self.assertEqual(joined_attr.data[9].value, 53)
self.assertEqual(joined_attr.data[20].value, 1)
self.assertEqual(joined_attr.data[9].value, 98)
self.assertEqual(joined_attr.data[20].value, 46)
def test_materials_simple(self):
bpy.ops.object.select_all(action='SELECT')
@ -91,11 +91,11 @@ class TestMeshJoin(unittest.TestCase):
cube_1 = bpy.context.view_layer.objects.active
cube_1.data.materials.append(mat_1)
material_indices = cube_1.data.attributes.new(name="material_index", type='INT', domain='FACE')
material_indices.data.foreach_set('value', [0, 1, 1, 700, 1, 2])
bpy.ops.mesh.primitive_cube_add()
cube_2 = bpy.context.view_layer.objects.active
material_indices = cube_2.data.attributes.new(name="material_index", type='INT', domain='FACE')
material_indices.data.foreach_set('value', [0, 1, 1, 700, 1, 2])
bpy.ops.object.select_all(action='SELECT')
bpy.context.view_layer.objects.active = cube_1
@ -106,7 +106,7 @@ class TestMeshJoin(unittest.TestCase):
material_indices = cube_1.data.attributes["material_index"]
self.assertTrue(material_indices)
material_index_data = [m.value for m in material_indices.data]
self.assertEqual(material_index_data, [0, 1, 1, 700, 1, 2] + [0] * 6)
self.assertEqual(material_index_data, [0] * 6 + [0, 1, 1, 700, 1, 2])
def test_materials(self):
bpy.ops.object.select_all(action='SELECT')