diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 15:51:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 15:55:15 +0300 |
commit | d8dbd49a2f23b7637f05fc058f39bdf6ab706624 (patch) | |
tree | 0805b9372c82ae6505d87e879824efe1d3e32f8e /source/blender/collada/BCAnimationSampler.cpp | |
parent | 8987f7987d8160e1f6e79e8c85d6ce65b885ab25 (diff) |
Cleanup: style, use braces in source/
Automated using clang-tidy.
Diffstat (limited to 'source/blender/collada/BCAnimationSampler.cpp')
-rw-r--r-- | source/blender/collada/BCAnimationSampler.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp index 1e6ff79f132..f64a8e8bbb7 100644 --- a/source/blender/collada/BCAnimationSampler.cpp +++ b/source/blender/collada/BCAnimationSampler.cpp @@ -76,8 +76,9 @@ void BCAnimationSampler::add_object(Object *ob) BCAnimationCurveMap *BCAnimationSampler::get_curves(Object *ob) { BCAnimation &animation = *objects[ob]; - if (animation.curve_map.size() == 0) + if (animation.curve_map.size() == 0) { initialize_curves(animation.curve_map, ob); + } return &animation.curve_map; } @@ -88,8 +89,9 @@ static void get_sample_frames(BCFrameSet &sample_frames, { sample_frames.clear(); - if (sampling_rate < 1) + if (sampling_rate < 1) { return; // no sample frames in this case + } float sfra = scene->r.sfra; float efra = scene->r.efra; @@ -237,8 +239,9 @@ bool BCAnimationSampler::is_animated_by_constraint(Object *ob, const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con); - if (!bc_validateConstraints(con)) + if (!bc_validateConstraints(con)) { continue; + } if (cti && cti->get_constraint_targets) { bConstraintTarget *ct; @@ -247,8 +250,9 @@ bool BCAnimationSampler::is_animated_by_constraint(Object *ob, for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) { obtar = ct->tar; if (obtar) { - if (animated_objects.find(obtar) != animated_objects.end()) + if (animated_objects.find(obtar) != animated_objects.end()) { return true; + } } } } @@ -297,8 +301,9 @@ void BCAnimationSampler::get_animated_from_export_set(std::set<Object *> &animat } else { ListBase conlist = cob->constraints; - if (conlist.first) + if (conlist.first) { candidates.insert(cob); + } } } find_depending_animated(animated_objects, candidates); @@ -403,8 +408,9 @@ void BCAnimationSampler::generate_transforms(Object *ob, Bone *bone, BCAnimation std::string prep = "pose.bones[\"" + std::string(bone->name) + "\"]."; generate_transforms(ob, prep, BC_ANIMATION_TYPE_BONE, curves); - for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) + for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) { generate_transforms(ob, child, curves); + } } /** @@ -453,8 +459,9 @@ void BCAnimationSampler::initialize_curves(BCAnimationCurveMap &curves, Object * generate_transforms(ob, EMPTY_STRING, object_type, curves); if (ob->type == OB_ARMATURE) { bArmature *arm = (bArmature *)ob->data; - for (Bone *root_bone = (Bone *)arm->bonebase.first; root_bone; root_bone = root_bone->next) + for (Bone *root_bone = (Bone *)arm->bonebase.first; root_bone; root_bone = root_bone->next) { generate_transforms(ob, root_bone, curves); + } } /* Add curves on Object->data actions */ |