blender
/
blender
134
425
Fork 607
Code Issues 6.2k Pull Requests 778 Projects 19 Wiki Activity

Mesh: Move face shade smooth flag to a generic attribute #104422

Merged
Hans Goudey merged 59 commits from refactor-mesh-sharp-face-generic into main 2023-03-08 15:36:28 +01:00
Conversation 3 Commits 59 Files Changed 79 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 038c12c488 - Show all commits

6
source/blender/blenkernel/intern/mesh_mapping.cc
View File

@ -853,6 +853,8 @@ int *BKE_mesh_calc_smoothgroups(const int totedge,
{
int *poly_groups = nullptr;
auto poly_is_smooth = [&](const int i) { return !(sharp_faces && sharp_faces[i]); };
auto poly_is_island_boundary_smooth = [&](const int poly_index,
const int /*loop_index*/,
const int edge_index,
@ -860,13 +862,13 @@ int *BKE_mesh_calc_smoothgroups(const int totedge,
const MeshElemMap &edge_poly_map_elem) {
/* Edge is sharp if one of its polys is flat, or edge itself is sharp,
* or edge is not used by exactly two polygons. */
if (!(sharp_faces && sharp_faces[poly_index]) && !(sharp_edges && sharp_edges[edge_index]) &&
if ((poly_is_smooth(poly_index)) && !(sharp_edges && sharp_edges[edge_index]) &&
(edge_user_count == 2)) {
/* In that case, edge appears to be smooth, but we need to check its other poly too. */
const int other_poly_index = (poly_index == edge_poly_map_elem.indices[0]) ?
edge_poly_map_elem.indices[1] :
edge_poly_map_elem.indices[0];
return !(sharp_faces && sharp_faces[other_poly_index]);
return !poly_is_smooth(other_poly_index);
}
return true;
};