Merge branch 'master' into blender2.8

3 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index e923240120e..fc4bbea108b 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -60,7 +60,7 @@ bool AnimationExporter::is_flat_line(std::vector<float> &values, int channel_cou
 	return true;
 }
 /*
- *  This function creates a complete LINEAR Collada <Animation> Entry with all needed 
+ *  This function creates a complete LINEAR Collada <Animation> Entry with all needed
  *  <source>, <sampler>, and <channel> entries.
  *  This is is used for creating sampled Transformation Animations for either:
  *
@@ -78,8 +78,8 @@ bool AnimationExporter::is_flat_line(std::vector<float> &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.
  */
@@ -1572,7 +1572,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 f37b0ee1319..c9b2f6d6d55 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<FCurve *>& 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/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index b8fde34cc96..bf441effc81 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -307,7 +307,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.
  */