Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00
parent 297bf7235b 75fc1c3507
commit bfe1d0e0dc
801 changed files with 1530 additions and 1530 deletions
--- 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.
 */