From af35ada2f3fa8da4d46b3a71de724d353d716820 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 6 Nov 2020 14:25:30 +0100 Subject: Cleanup: Clang-Tidy, modernize-use-bool-literals --- source/blender/io/collada/AnimationImporter.cpp | 2 +- source/blender/io/collada/DocumentImporter.cpp | 2 +- source/blender/io/collada/SceneExporter.cpp | 2 +- source/blender/io/collada/SkinInfo.cpp | 2 +- source/blender/io/collada/collada_utils.cpp | 2 +- source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/io') diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 645a821b463..df81e638c68 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -355,7 +355,7 @@ void AnimationImporter::read_node_transform(COLLADAFW::Node *node, Object *ob) TransformReader::get_node_mat(mat, node, &uid_animated_map, ob); if (ob) { copy_m4_m4(ob->obmat, mat); - BKE_object_apply_mat4(ob, ob->obmat, 0, 0); + BKE_object_apply_mat4(ob, ob->obmat, false, false); } } diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index b9f132d04dd..f7f9bf3f2f9 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -438,7 +438,7 @@ Object *DocumentImporter::create_instance_node(Object *source_ob, } /* calc new matrix and apply */ mul_m4_m4m4(obn->obmat, obn->obmat, mat); - BKE_object_apply_mat4(obn, obn->obmat, 0, 0); + BKE_object_apply_mat4(obn, obn->obmat, false, false); } } else { diff --git a/source/blender/io/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp index 1b3bc1b66ea..b8de5bbd91e 100644 --- a/source/blender/io/collada/SceneExporter.cpp +++ b/source/blender/io/collada/SceneExporter.cpp @@ -222,7 +222,7 @@ void SceneExporter::writeNode(Object *ob) } if (cti->flush_constraint_targets) { - cti->flush_constraint_targets(con, &targets, 1); + cti->flush_constraint_targets(con, &targets, true); } } diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index eef45a5be90..726127a1532 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -248,7 +248,7 @@ void SkinInfo::link_armature(bContext *C, DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); #endif copy_m4_m4(ob->obmat, bind_shape_matrix); - BKE_object_apply_mat4(ob, ob->obmat, 0, 0); + BKE_object_apply_mat4(ob, ob->obmat, false, false); amd->deformflag = ARM_DEF_VGROUP; diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 30c77c0a7df..d050554d916 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -371,7 +371,7 @@ void bc_match_scale(Object *ob, UnitConverter &bc_unit, bool scale_to_scene) mul_m4_m4m4(ob->obmat, bc_unit.get_scale(), ob->obmat); } mul_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat); - BKE_object_apply_mat4(ob, ob->obmat, 0, 0); + BKE_object_apply_mat4(ob, ob->obmat, false, false); } void bc_match_scale(std::vector *objects_done, diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc index 6e4509afd30..ad0d6820e2b 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc @@ -272,7 +272,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest) /* Even when only asking an export of transforms, on the first frame everything should be * exported. */ { - ExportSubset export_subset = {0}; + ExportSubset export_subset = {false}; export_subset.transforms = true; export_subset.shapes = false; iterator->set_export_subset(export_subset); @@ -296,7 +296,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest) /* Third iteration, should only write data now. */ { - ExportSubset export_subset = {0}; + ExportSubset export_subset = {false}; export_subset.transforms = false; export_subset.shapes = true; iterator->set_export_subset(export_subset); @@ -311,7 +311,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest) /* Fourth iteration, should export everything now. */ { - ExportSubset export_subset = {0}; + ExportSubset export_subset = {false}; export_subset.transforms = true; export_subset.shapes = true; iterator->set_export_subset(export_subset); -- cgit v1.2.3