blender
/
blender
137
410
Fork 592
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Mesh: Reduce custom normal calculation memory usage #107592

Merged
Hans Goudey merged 32 commits from HooglyBoogly/blender:corner-normals-refactor-storage into main 2023-05-10 14:41:16 +02:00
Conversation 5 Commits 32 Files Changed 4 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59bdd13e13 - Show all commits

4
source/blender/blenkernel/BKE_mesh.hh
View File

@ -120,8 +120,8 @@ struct CornerNormalSpaceArray {
Array<int> corner_space_indices;
};
void lnor_space_custom_data_to_normal(const CornerNormalSpace *lnor_space,
const float3 lnor_no_custom,
void lnor_space_custom_normal_to_data(const CornerNormalSpace *lnor_space,
Campbell Barton commented 2023-05-08 03:10:33 +02:00
Outdated
Review
Copy Link

The naming here introduces "fan_space_custom_normal" which reads as if it might be different from CornerNormalSpace (as if there might be a "fan space" and a "corner normal space").

This could be more clearly names that it's a direct conversion from CornerNormalSpace to CD_CUSTOMLOOPNORMAL.

e.g. corner_normal_space_to_clnor.

The naming here introduces "fan_space_custom_normal" which reads as if it might be different from `CornerNormalSpace` (as if there might be a _"fan space"_ and a _"corner normal space"_). This could be more clearly names that it's a direct conversion from `CornerNormalSpace` to `CD_CUSTOMLOOPNORMAL`. e.g. `corner_normal_space_to_clnor`.
Hans Goudey commented 2023-05-08 03:29:40 +02:00
Outdated
Review
Copy Link

Ah, sorry, I meant to rename that and keep the same name as before like you suggested.

Ah, sorry, I meant to rename that and keep the same name as before like you suggested.
float3 lnor_no_custom,
const float custom_lnor[3],
short r_clnor_data[2]);

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

@ -434,7 +434,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
mul_m4_v3(mtx_nor, loop_normals[mirrorj]);
const int space_index = lnors_spacearr.corner_space_indices[mirrorj];
blender::bke::mesh::lnor_space_custom_data_to_normal(&lnors_spacearr.spaces[space_index],
blender::bke::mesh::lnor_space_custom_normal_to_data(&lnors_spacearr.spaces[space_index],
loop_normals[mirrorj],
loop_normals[mirrorj],
clnors[mirrorj]);