blender
/
blender
135
425
Fork 608
Code Issues 6.2k Pull Requests 779 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 +3 -6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d8abf380e0 - Show all commits

9
source/blender/makesrna/intern/rna_mesh.c
View File

@ -665,7 +665,7 @@ static bool rna_MeshPolygon_use_smooth_get(PointerRNA *ptr)
const bool *sharp_faces = (const bool *)CustomData_get_layer_named(
&mesh->pdata, CD_PROP_BOOL, "sharp_face");
const int index = rna_MeshPolygon_index_get(ptr);
return sharp_faces == NULL ? false : sharp_faces[index];
return !(sharp_faces && sharp_faces[index]);
}
static void rna_MeshPolygon_use_smooth_set(PointerRNA *ptr, bool value)
@ -1688,13 +1688,10 @@ static int rna_MeshLoopTriangle_material_index_get(PointerRNA *ptr)
static bool rna_MeshLoopTriangle_use_smooth_get(PointerRNA *ptr)
{
const Mesh *me = rna_mesh(ptr);
const MLoopTri *ltri = (MLoopTri *)ptr->data;
const bool *sharp_faces = (const bool *)CustomData_get_layer_named(
&me->pdata, CD_PROP_BOOL, "sharp_face");
if (!sharp_faces) {
return true;
}
const MLoopTri *ltri = (MLoopTri *)ptr->data;
return sharp_faces[ltri->poly];
return !(sharp_faces && sharp_faces[ltri->poly]);
}
/* path construction */