Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 19:46:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 19:48:29 +0300
commit342e73f90fc5c41af8db3a6e3dfdf1746f7f5bc4 (patch)
tree47fdb91d8e16b1c89f9ca358cb0172e862905ee1 /source/blender/collada
parent9682e43bf9e078165b3d4d52c6a19c430ec2cbf2 (diff)
Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz.
Differential Revision: https://developer.blender.org/D3719
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/ControllerExporter.cpp2
-rw-r--r--source/blender/collada/MeshImporter.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index 4de26639519..cb8903200f1 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -546,7 +546,7 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas
}
}
- // back from rest positon
+ // back from rest position
if (!(flag & ARM_RESTPOS)) {
arm->flag = flag;
BKE_pose_where_is(depsgraph, scene, ob_arm);
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 31bf690cb0d..4c0c13db72c 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1092,7 +1092,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
// add object
Object *ob = bc_add_object(m_bmain, scene, view_layer, OB_MESH, name);
- bc_set_mark(ob); // used later for material assignement optimization
+ bc_set_mark(ob); // used later for material assignment optimization
// store object pointer for ArmatureImporter