From 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 1 Jun 2018 18:19:39 +0200 Subject: Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts. --- source/blender/collada/AnimationExporter.cpp | 12 ++++++------ source/blender/collada/AnimationImporter.cpp | 2 +- source/blender/collada/GeometryExporter.cpp | 6 +++--- source/blender/collada/collada_utils.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index a59665f897f..c891414f088 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -60,7 +60,7 @@ bool AnimationExporter::is_flat_line(std::vector &values, int channel_cou return true; } /* - * This function creates a complete LINEAR Collada Entry with all needed + * This function creates a complete LINEAR Collada Entry with all needed * , , and entries. * This is is used for creating sampled Transformation Animations for either: * @@ -78,8 +78,8 @@ bool AnimationExporter::is_flat_line(std::vector &values, int channel_cou * axis_name = "" (actually not used) * is_rot = false (see xxx below) * - * xxx: I tried to create a 3 axis rotation animation - * like for translation or scale. But i could not + * xxx: I tried to create a 3 axis rotation animation + * like for translation or scale. But i could not * figure out how to setup the channel for this case. * So for now rotations are exported as 3 separate 1-axis collada animations * See export_sampled_animation() further down. @@ -1035,8 +1035,8 @@ void AnimationExporter::evaluate_anim_with_constraints(Object *ob, float ctime) /* * ob is needed to aply parent inverse information to fcurve. * TODO: Here we have to step over all keyframes for each object and for each fcurve. - * Instead of processing each fcurve one by one, - * step over the animation from keyframe to keyframe, + * Instead of processing each fcurve one by one, + * step over the animation from keyframe to keyframe, * then create adjusted fcurves (and entries) for all affected objects. * Then we would need to step through the scene only once. */ @@ -1571,7 +1571,7 @@ std::string AnimationExporter::get_camera_param_sid(char *rna_path, int tm_type, } /* - * Assign sid of the animated parameter or transform for rotation, + * Assign sid of the animated parameter or transform for rotation, * axis name is always appended and the value of append_axis is ignored */ std::string AnimationExporter::get_transform_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis) diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 75017ce32b4..31dbef998d9 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -869,7 +869,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector& a /* * This function returns the aspet ration from the Collada camera. * - * Note:COLLADA allows to specify either XFov, or YFov alone. + * Note:COLLADA allows to specify either XFov, or YFov alone. * In that case the aspect ratio can be determined from * the viewport aspect ratio (which is 1:1 ?) * XXX: check this: its probably wrong! diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 8406426a366..f09307c1891 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -519,11 +519,11 @@ void GeometryExporter::createPolylists(std::set uv_images, } /* =========================================================================== - * Export Meshes with UV Textures (export as materials, see also in + * Export Meshes with UV Textures (export as materials, see also in * effectExporter and MaterialExporter) - * + * * If imageid is the empty string, then collect only untextured polygons - * =========================================================================== */ + * =========================================================================== */ void GeometryExporter::createPolylist(std::string imageid, bool has_uvs, bool has_color, diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 8c4ddd67d07..27389990082 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -300,7 +300,7 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set) } /* Check if a bone is the top most exportable bone in the bone hierarchy. - * When deform_bones_only == false, then only bones with NO parent + * When deform_bones_only == false, then only bones with NO parent * can be root bones. Otherwise the top most deform bones in the hierarchy * are root bones. */ -- cgit v1.2.3