Merge pull request #706 from expipiplus1/spelling

Correct spelling
pull/715/head
Alexander Gessler 2015-12-10 21:49:24 +01:00
commit 5fc66d6c43
3 changed files with 7 additions and 7 deletions

View File

@ -848,7 +848,7 @@ void ColladaParser::ReadMaterialLibrary()
{ {
if( IsElement( "material")) 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"); int attrID = GetAttribute( "id");
std::string id = mReader->getAttributeValue( attrID); std::string id = mReader->getAttributeValue( attrID);
@ -906,7 +906,7 @@ void ColladaParser::ReadLightLibrary()
if( mReader->getNodeType() == irr::io::EXN_ELEMENT) { if( mReader->getNodeType() == irr::io::EXN_ELEMENT) {
if( IsElement( "light")) 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"); int attrID = GetAttribute( "id");
std::string id = mReader->getAttributeValue( attrID); std::string id = mReader->getAttributeValue( attrID);
@ -940,7 +940,7 @@ void ColladaParser::ReadCameraLibrary()
if( mReader->getNodeType() == irr::io::EXN_ELEMENT) { if( mReader->getNodeType() == irr::io::EXN_ELEMENT) {
if( IsElement( "camera")) 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"); int attrID = GetAttribute( "id");
std::string id = mReader->getAttributeValue( attrID); std::string id = mReader->getAttributeValue( attrID);
@ -1976,7 +1976,7 @@ void ColladaParser::ReadIndexData( Mesh* pMesh)
ai_assert( primType != Prim_Invalid); ai_assert( primType != Prim_Invalid);
// also a number of <input> elements, but in addition a <p> primitive collection and propably index counts for all primitives // also a number of <input> elements, but in addition a <p> primitive collection and probably index counts for all primitives
while( mReader->read()) while( mReader->read())
{ {
if( mReader->getNodeType() == irr::io::EXN_ELEMENT) if( mReader->getNodeType() == irr::io::EXN_ELEMENT)

View File

@ -145,7 +145,7 @@ project dependencies. Link to <assimp_root>/lib/<config-name>/assimp.lib. config
project configs. For static linking, use release/debug. See the sections below on this page for more information on the project configs. For static linking, use release/debug. See the sections below on this page for more information on the
other build configs. other build configs.
If done correctly you should now be able to compile, link, 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 -&gt; C++ -&gt; Code generation -&gt; Runtime) if you use mixed the runtimes. Recheck the project configuration (project properties -&gt; C++ -&gt; Code generation -&gt; Runtime) if you use
static runtimes (Multithreaded / Multithreaded Debug) or dynamic runtimes (Multithreaded DLL / Multithreaded Debug DLL). static runtimes (Multithreaded / Multithreaded Debug) or dynamic runtimes (Multithreaded DLL / Multithreaded Debug DLL).
Choose the assimp linker lib accordingly. 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 // And have it read the given file with some example postprocessing
// Usually - if speed is not the most important aspect for you - you'll // 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, const aiScene* scene = importer.ReadFile( pFile,
aiProcess_CalcTangentSpace | aiProcess_CalcTangentSpace |
aiProcess_Triangulate | aiProcess_Triangulate |

View File

@ -37,7 +37,7 @@
#if defined(_MSC_VER) #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) # pragma warning (disable : 4103)
#endif #endif