diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/collada/ArmatureImporter.cpp | |
parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 080a62536f5..de66c6ebdb2 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -439,14 +439,16 @@ Object *ArmatureImporter::get_empty_for_leaves() Object *ArmatureImporter::find_armature(COLLADAFW::Node *node) { JointData *jd = get_joint_data(node); - if (jd) + if (jd) { return jd->ob_arm; + } COLLADAFW::NodePointerArray &children = node->getChildNodes(); for (int i = 0; i < children.getCount(); i++) { Object *ob_arm = find_armature(children[i]); - if (ob_arm) + if (ob_arm) { return ob_arm; + } } return NULL; @@ -457,8 +459,9 @@ ArmatureJoints &ArmatureImporter::get_armature_joints(Object *ob_arm) /* try finding it */ std::vector<ArmatureJoints>::iterator it; for (it = armature_joints.begin(); it != armature_joints.end(); it++) { - if ((*it).ob_arm == ob_arm) + if ((*it).ob_arm == ob_arm) { return *it; + } } /* not found, create one */ |