[Bf-blender-cvs] [d8abf380e07] refactor-mesh-sharp-face-generic: Fix "use smooth" RNA access
Hans Goudey
noreply at git.blender.org
Sun Jan 22 18:11:43 CET 2023
Commit: d8abf380e072b946bd280e2321bd13f2b691bae5
Author: Hans Goudey
Date: Sun Jan 22 11:11:33 2023 -0600
Branches: refactor-mesh-sharp-face-generic
https://developer.blender.org/rBd8abf380e072b946bd280e2321bd13f2b691bae5
Fix "use smooth" RNA access
===================================================================
M source/blender/makesrna/intern/rna_mesh.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index f73f40d34ee..d4a0df75269 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -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 */
More information about the Bf-blender-cvs
mailing list