From 210764a6ffee7dc63ad578feeed1a3c5b5d0e620 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 10 Dec 2015 16:19:33 +0000 Subject: [PATCH] Correct spelling --- code/ColladaParser.cpp | 8 ++++---- doc/dox.h | 4 ++-- include/assimp/Compiler/pushpack1.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp index f65d244c2..b3a433fc3 100644 --- a/code/ColladaParser.cpp +++ b/code/ColladaParser.cpp @@ -848,7 +848,7 @@ void ColladaParser::ReadMaterialLibrary() { if( IsElement( "material")) { - // read ID. By now you propably know my opinion about this "specification" + // read ID. By now you probably know my opinion about this "specification" int attrID = GetAttribute( "id"); std::string id = mReader->getAttributeValue( attrID); @@ -906,7 +906,7 @@ void ColladaParser::ReadLightLibrary() if( mReader->getNodeType() == irr::io::EXN_ELEMENT) { if( IsElement( "light")) { - // read ID. By now you propably know my opinion about this "specification" + // read ID. By now you probably know my opinion about this "specification" int attrID = GetAttribute( "id"); std::string id = mReader->getAttributeValue( attrID); @@ -940,7 +940,7 @@ void ColladaParser::ReadCameraLibrary() if( mReader->getNodeType() == irr::io::EXN_ELEMENT) { if( IsElement( "camera")) { - // read ID. By now you propably know my opinion about this "specification" + // read ID. By now you probably know my opinion about this "specification" int attrID = GetAttribute( "id"); std::string id = mReader->getAttributeValue( attrID); @@ -1976,7 +1976,7 @@ void ColladaParser::ReadIndexData( Mesh* pMesh) ai_assert( primType != Prim_Invalid); - // also a number of elements, but in addition a

primitive collection and propably index counts for all primitives + // also a number of elements, but in addition a

primitive collection and probably index counts for all primitives while( mReader->read()) { if( mReader->getNodeType() == irr::io::EXN_ELEMENT) diff --git a/doc/dox.h b/doc/dox.h index aad0925bd..cd9214453 100644 --- a/doc/dox.h +++ b/doc/dox.h @@ -145,7 +145,7 @@ project dependencies. Link to /lib//assimp.lib. config project configs. For static linking, use release/debug. See the sections below on this page for more information on the other build configs. If done correctly you should now be able to compile, link, -run and use the application. If the linker complains about some integral functions being defined twice you propably have +run and use the application. If the linker complains about some integral functions being defined twice you probably have mixed the runtimes. Recheck the project configuration (project properties -> C++ -> Code generation -> Runtime) if you use static runtimes (Multithreaded / Multithreaded Debug) or dynamic runtimes (Multithreaded DLL / Multithreaded Debug DLL). Choose the assimp linker lib accordingly. @@ -287,7 +287,7 @@ bool DoTheImportThing( const std::string& pFile) // And have it read the given file with some example postprocessing // Usually - if speed is not the most important aspect for you - you'll - // propably to request more postprocessing than we do in this example. + // probably to request more postprocessing than we do in this example. const aiScene* scene = importer.ReadFile( pFile, aiProcess_CalcTangentSpace | aiProcess_Triangulate | diff --git a/include/assimp/Compiler/pushpack1.h b/include/assimp/Compiler/pushpack1.h index e55202665..73973c50d 100644 --- a/include/assimp/Compiler/pushpack1.h +++ b/include/assimp/Compiler/pushpack1.h @@ -37,7 +37,7 @@ #if defined(_MSC_VER) -// C4103: Packing was changed after the inclusion of the header, propably missing #pragma pop +// C4103: Packing was changed after the inclusion of the header, probably missing #pragma pop # pragma warning (disable : 4103) #endif