From 8c846cccd6bdfd3e90a695fabbf05f53e5466a57 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 Nov 2020 15:46:15 +1100 Subject: Cleanup: clang-format --- source/blender/io/collada/ArmatureImporter.cpp | 3 ++- source/blender/io/collada/MeshImporter.cpp | 6 ++++-- source/blender/io/collada/collada_utils.cpp | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'source/blender/io/collada') diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index aa3b6615444..9533ca322f9 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -506,7 +506,8 @@ void ArmatureImporter::create_armature_bones(Main *bmain, std::vector ED_armature_to_edit(armature); armature->layer = 0; /* layer is set according to imported bone set in create_bone() */ - create_bone(nullptr, node, nullptr, node->getChildNodes().getCount(), nullptr, armature, layer_labels); + create_bone( + nullptr, node, nullptr, node->getChildNodes().getCount(), nullptr, armature, layer_labels); if (this->import_settings->find_chains) { connect_bone_chains(armature, (Bone *)armature->bonebase.first, UNLIMITED_CHAIN_MAX); } diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 196dafc19cf..bb2aabb0598 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -469,8 +469,10 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me) if (total_poly_count > 0) { me->totpoly = total_poly_count; me->totloop = total_loop_count; - me->mpoly = (MPoly *)CustomData_add_layer(&me->pdata, CD_MPOLY, CD_CALLOC, nullptr, me->totpoly); - me->mloop = (MLoop *)CustomData_add_layer(&me->ldata, CD_MLOOP, CD_CALLOC, nullptr, me->totloop); + me->mpoly = (MPoly *)CustomData_add_layer( + &me->pdata, CD_MPOLY, CD_CALLOC, nullptr, me->totpoly); + me->mloop = (MLoop *)CustomData_add_layer( + &me->ldata, CD_MLOOP, CD_CALLOC, nullptr, me->totloop); unsigned int totuvset = collada_mesh->getUVCoords().getInputInfosArray().getCount(); for (int i = 0; i < totuvset; i++) { diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 58b579f5ac0..c57952afcc8 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -144,7 +144,8 @@ bool bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space) mul_m4_m4m4(ob->obmat, par->obmat, ob->obmat); } - bool ok = ED_object_parent_set(nullptr, C, scene, ob, par, partype, xmirror, keep_transform, nullptr); + bool ok = ED_object_parent_set( + nullptr, C, scene, ob, par, partype, xmirror, keep_transform, nullptr); return ok; } -- cgit v1.2.3