From 0cff044d84646c2890f13b8915eb708861bb36d6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Sep 2018 17:27:41 +0200 Subject: Spelling fixes in comments and descriptions, patch by luzpaz. Differential Revision: https://developer.blender.org/D3719 --- source/blender/collada/AnimationExporter.cpp | 2 +- source/blender/collada/ControllerExporter.cpp | 2 +- source/blender/collada/MeshImporter.cpp | 18 +++++++++--------- source/blender/collada/SceneExporter.cpp | 2 +- source/blender/collada/collada_utils.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 6e4561809fd..1cacee836ba 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -139,7 +139,7 @@ void AnimationExporter::create_sampled_animation(int channel_count, * Export all animation FCurves of an Object. * * Note: This uses the keyframes as sample points, - * and exports "baked keyframes" while keeping the tangent infromation + * and exports "baked keyframes" while keeping the tangent information * of the FCurves intact. This works for simple cases, but breaks * especially when negative scales are involved in the animation. * diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 5673d33fcbf..fa3f0267314 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -398,7 +398,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob) return source_id; } -//Added to implemente support for animations. +//Added to implement support for animations. void ControllerExporter::add_weight_extras(Key *key) { // can also try the base element and param alternative diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index d121268d8d9..1f24010b04e 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -183,7 +183,7 @@ void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol) case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT: { COLLADAFW::ArrayPrimitiveType *values = mVData->getFloatValues(); - if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an eror instead + if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an error instead mloopcol->r = unit_float_to_uchar_clamp((*values)[v_index * stride]); mloopcol->g = unit_float_to_uchar_clamp((*values)[v_index * stride + 1]); @@ -194,7 +194,7 @@ void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol) case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE: { COLLADAFW::ArrayPrimitiveType *values = mVData->getDoubleValues(); - if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an eror instead + if (values->empty() || values->getCount() <= (v_index * stride + 2)) return; // xxx need to create an error instead mloopcol->r = unit_float_to_uchar_clamp((*values)[v_index * stride]); mloopcol->g = unit_float_to_uchar_clamp((*values)[v_index * stride + 1]); @@ -546,7 +546,7 @@ unsigned int MeshImporter::get_loose_edge_count(COLLADAFW::Mesh *mesh) { } // ================================================================= -// This functin is copied from source/blender/editors/mesh/mesh_data.c +// This function is copied from source/blender/editors/mesh/mesh_data.c // // TODO: (As discussed with sergey-) : // Maybe move this function to blenderkernel/intern/mesh.c @@ -585,7 +585,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len) // ================================================================= // Read all loose edges. // Important: This function assumes that all edges from existing -// faces have allready been generated and added to me->medge +// faces have already been generated and added to me->medge // So this function MUST be called after read_faces() (see below) // ================================================================= void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me) @@ -679,7 +679,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me) unsigned int vertex_count = mp->getGroupedVerticesVertexCount(group_index); for (unsigned int vertex_index = 0; vertex_index < vertex_count - 2; vertex_index++) { - // For each triangle store indeces of its 3 vertices + // For each triangle store indices of its 3 vertices unsigned int triangle_vertex_indices[3] = {first_vertex, position_indices[1], position_indices[2]}; set_poly_indices(mpoly, mloop, loop_index, triangle_vertex_indices, 3); @@ -944,7 +944,7 @@ static bool bc_has_same_material_configuration(Object *ob1, Object *ob2) /** * - * Caution here: This code assumes tha all materials are assigned to Object + * Caution here: This code assumes that all materials are assigned to Object * and no material is assigned to Data. * That is true right after the objects have been imported. * @@ -1078,7 +1078,7 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri Material *ma = uid_material_map[ma_uid]; - // Attention! This temporaly assigns material to object on purpose! + // Attention! This temporarily assigns material to object on purpose! // See note above. ob->actcol=0; assign_material(m_bmain, ob, ma, mat_index + 1, BKE_MAT_ASSIGN_OBJECT); @@ -1138,7 +1138,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta { const COLLADAFW::UniqueId *geom_uid = &geom->getInstanciatedObjectId(); - // check if node instanciates controller or geometry + // check if node instantiates controller or geometry if (isController) { geom_uid = armature_importer->get_geometry_uid(*geom_uid); @@ -1241,7 +1241,7 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry *geom) // BKE_mesh_calc_edges(me, false, false); // read_lines() must be called after the face edges have been generated. - // Oterwise the loose edges will be silently deleted again. + // Otherwise the loose edges will be silently deleted again. read_lines(mesh, me); return true; diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp index a0d1b6b5333..b571b7503d5 100644 --- a/source/blender/collada/SceneExporter.cpp +++ b/source/blender/collada/SceneExporter.cpp @@ -59,7 +59,7 @@ void SceneExporter::exportHierarchy(bContext *C, Scene *sce) ob->id.tag |= LIB_TAG_DOIT; } - // Now find all exportable base ojects (highest in export hierarchy) + // Now find all exportable base objects (highest in export hierarchy) for (node = this->export_settings->export_set; node; node = node->next) { Object *ob = (Object *) node->link; if (bc_is_base_node(this->export_settings->export_set, ob)) { diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 07e2c834221..ec45a6dee36 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -768,7 +768,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 -- cgit v1.2.3