Merge branch 'master' into blender2.8

2018-09-24 17:41:46 +02:00
parent fe52a05e95 0cff044d84
commit 253dce07d7
111 changed files with 183 additions and 179 deletions
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -775,7 +775,7 @@ float bc_get_property(Bone *bone, std::string key, float def)

 /**
 * Read a custom bone property and convert to matrix
- * Return true if conversion was succesfull
+ * Return true if conversion was successful
 *
 * Return false if:
 * - the property does not exist