From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- .../blenkernel/intern/subdiv_ccg_material.c | 44 ++++++++++------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'source/blender/blenkernel/intern/subdiv_ccg_material.c') diff --git a/source/blender/blenkernel/intern/subdiv_ccg_material.c b/source/blender/blenkernel/intern/subdiv_ccg_material.c index 1e086e00e25..9a81eb11989 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_material.c +++ b/source/blender/blenkernel/intern/subdiv_ccg_material.c @@ -28,40 +28,36 @@ #include "DNA_mesh_types.h" typedef struct CCGMaterialFromMeshData { - const Mesh *mesh; + const Mesh *mesh; } CCGMaterialFromMeshData; static DMFlagMat subdiv_ccg_material_flags_eval( - SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator, - const int coarse_face_index) + SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator, const int coarse_face_index) { - CCGMaterialFromMeshData *data = - (CCGMaterialFromMeshData *)material_flags_evaluator->user_data; - const Mesh *mesh = data->mesh; - BLI_assert(coarse_face_index < mesh->totpoly); - const MPoly *mpoly = mesh->mpoly; - const MPoly *poly = &mpoly[coarse_face_index]; - DMFlagMat material_flags; - material_flags.flag = poly->flag; - material_flags.mat_nr = poly->mat_nr; - return material_flags; + CCGMaterialFromMeshData *data = (CCGMaterialFromMeshData *)material_flags_evaluator->user_data; + const Mesh *mesh = data->mesh; + BLI_assert(coarse_face_index < mesh->totpoly); + const MPoly *mpoly = mesh->mpoly; + const MPoly *poly = &mpoly[coarse_face_index]; + DMFlagMat material_flags; + material_flags.flag = poly->flag; + material_flags.mat_nr = poly->mat_nr; + return material_flags; } static void subdiv_ccg_material_flags_free( - SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator) + SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator) { - MEM_freeN(material_flags_evaluator->user_data); + MEM_freeN(material_flags_evaluator->user_data); } void BKE_subdiv_ccg_material_flags_init_from_mesh( - SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator, - const Mesh *mesh) + SubdivCCGMaterialFlagsEvaluator *material_flags_evaluator, const Mesh *mesh) { - CCGMaterialFromMeshData *data = MEM_mallocN( - sizeof(CCGMaterialFromMeshData), "ccg material eval"); - data->mesh = mesh; - material_flags_evaluator->eval_material_flags = - subdiv_ccg_material_flags_eval; - material_flags_evaluator->free = subdiv_ccg_material_flags_free; - material_flags_evaluator->user_data = data; + CCGMaterialFromMeshData *data = MEM_mallocN(sizeof(CCGMaterialFromMeshData), + "ccg material eval"); + data->mesh = mesh; + material_flags_evaluator->eval_material_flags = subdiv_ccg_material_flags_eval; + material_flags_evaluator->free = subdiv_ccg_material_flags_free; + material_flags_evaluator->user_data = data; } -- cgit v1.2.3