Paths

Table of Contentst

Differential D15676

Cleanup: some refactoring in mapped mesh extraction
ClosedPublic
Actions

Authored by Brecht Van Lommel (brecht) on Aug 12 2022, 7:54 PM.

Tags

None

Subscribers

None

Details

Reviewers

Kévin Dietrich (kevindietrich)
Clément Foucault (fclem)

Commits

rBb247588dc0f4: Cleanup: some refactoring in mapped mesh extraction

Summary

Flip the logic to first detect if we are dealing with an unmodified mesh in editmode. And then if not, detect if we need a mapping or not.
runtime.is_original is only valid for the bmesh wrapper. Rename it to clarify that and only check it when the mesh is a bmesh wrapper.
Remove MR_EXTRACT_MAPPED and instead check only for the existence of the origindex arrays. Previously it would sometimes access those arrays without MR_EXTRACT_MAPPED set, which according to a comment means they are invalid.

Depends on D15658

Diff Detail

Repository

Branch

fix-subd-select (branched from master)

Build Status

Buildable 23341
Build 23341: arc lint + arc unit

Event Timeline

Brecht Van Lommel (brecht) requested review of this revision.Aug 12 2022, 7:54 PM

Brecht Van Lommel (brecht) created this revision.

Harbormaster completed remote builds in B23341: Diff 54637.Aug 12 2022, 7:54 PM

This is refactoring I did for D15658, but that ultimately was not necessary to fix that specific bug.

I don't know if this fixes any real bugs, but maybe worth landing in master since I find the correctness of the old logic very hard to verify.

Looks good to me (tm). But would still like someone else more familiar with the extractor code to have a look.

This revision is now accepted and ready to land.Aug 16 2022, 10:32 AM

I haven't noted this in D15658, but the removal of MR_EXTRACT_MAPPED in the extractors kind of looks like the extension of D14773 where it was also removed in some places as the origindex layers were used even without mapped extraction. Comments in D14773 also point to removing all of these, but it was not done as back then we were in BCon3 already, and then was forgotten about.

Closed by commit rBb247588dc0f4: Cleanup: some refactoring in mapped mesh extraction (authored by Brecht Van Lommel (brecht)). · Explain WhyAug 16 2022, 6:10 PM

This revision was automatically updated to reflect the committed changes.

Brecht Van Lommel (brecht) added a commit: rBb247588dc0f4: Cleanup: some refactoring in mapped mesh extraction.

Revision Contents
Changeset List

Path

Size

source/

blender/

blenkernel/

intern/

2 lines

3 lines

mesh_wrapper.cc

4 lines

draw/

intern/

draw_cache_extract_mesh_render_data.cc

63 lines

draw_cache_impl_mesh.cc

2 lines

draw_cache_impl_subdivision.cc

2 lines

mesh_extractors/

extract_mesh.hh

1 line

extract_mesh_ibo_lines.cc

43 lines

extract_mesh_ibo_lines_paint_mask.cc

6 lines

extract_mesh_ibo_points.cc

3 lines

extract_mesh_vbo_edituv_stretch_angle.cc

2 lines

extract_mesh_vbo_edituv_stretch_area.cc

4 lines

extract_mesh_vbo_fdots_nor.cc

12 lines

extract_mesh_vbo_lnor.cc

12 lines

extract_mesh_vbo_pos_nor.cc

6 lines

makesdna/

DNA_mesh_types.h

2 lines

modifiers/

intern/

MOD_datatransfer.c

2 lines

MOD_normal_edit.c

2 lines

MOD_uvproject.c

2 lines

2 lines

MOD_weighted_normal.c

2 lines

MOD_weightvgedit.c

2 lines

MOD_weightvgmix.c

2 lines

MOD_weightvgproximity.c

2 lines

Diff 54637

source/blender/blenkernel/intern/mesh.cc

Loading...

source/blender/blenkernel/intern/mesh_debug.cc

Loading...

source/blender/blenkernel/intern/mesh_wrapper.cc

Loading...

source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc

Loading...

source/blender/draw/intern/draw_cache_impl_mesh.cc

Loading...

source/blender/draw/intern/draw_cache_impl_subdivision.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh.hh

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc

Loading...

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc

Loading...

source/blender/makesdna/DNA_mesh_types.h

Loading...

source/blender/modifiers/intern/MOD_datatransfer.c

Loading...

source/blender/modifiers/intern/MOD_normal_edit.c

Loading...

source/blender/modifiers/intern/MOD_uvproject.c

Loading...

source/blender/modifiers/intern/MOD_uvwarp.c

Loading...

source/blender/modifiers/intern/MOD_weighted_normal.c

Loading...

source/blender/modifiers/intern/MOD_weightvgedit.c

Loading...

source/blender/modifiers/intern/MOD_weightvgmix.c

Loading...

source/blender/modifiers/intern/MOD_weightvgproximity.c

Loading...