v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #183 from erich666/master 

typo fix: loose -> lose
pull/189/head
Alexander Gessler 2013-11-14 10:24:32 -08:00
parent babc54478e f2997a562b
commit 156f7c1ded
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/MS3DLoader.cpp
View File

@ -563,7 +563,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
} }
// ... add dummy nodes under a single root, each holding a reference to one // ... add dummy nodes under a single root, each holding a reference to one
// mesh. If we didn't do this, we'd loose the group name. // mesh. If we didn't do this, we'd lose the group name.
aiNode* rt = pScene->mRootNode = new aiNode("<MS3DRoot>"); aiNode* rt = pScene->mRootNode = new aiNode("<MS3DRoot>");
#ifdef ASSIMP_BUILD_MS3D_ONE_NODE_PER_MESH #ifdef ASSIMP_BUILD_MS3D_ONE_NODE_PER_MESH

2
doc/dox.h
View File

@ -191,7 +191,7 @@ can use a comfortable installer from <a href="http://www.boost-consulting.com/pr
http://www.boost-consulting.com/products/free</a>. Choose the appropriate version of boost for your runtime of choice. http://www.boost-consulting.com/products/free</a>. Choose the appropriate version of boost for your runtime of choice.
<b>If you don't want to use boost</b>, you can build against our <i>"Boost-Workaround"</i>. It consists of very small <b>If you don't want to use boost</b>, you can build against our <i>"Boost-Workaround"</i>. It consists of very small
implementations of the various boost utility classes used. However, you'll loose functionality (e.g. threading) by doing this. implementations of the various boost utility classes used. However, you'll lose functionality (e.g. threading) by doing this.
So, if you can use boost, you should use boost. Otherwise, See the @link use_noboost NoBoost-Section @endlink So, if you can use boost, you should use boost. Otherwise, See the @link use_noboost NoBoost-Section @endlink
later on this page for the details of the workaround. later on this page for the details of the workaround.

2
samples/glut/README-win32.txt
View File

@ -139,7 +139,7 @@ IMPLEMENTATION DEPENDENT DIFFERENCES:
Specifically, the "window manager" in Win32 uses a "click to Specifically, the "window manager" in Win32 uses a "click to
focus" policy. That is, in order for a window to receive focus" policy. That is, in order for a window to receive
focus, a mouse button must be clicked in it. Likewise, in focus, a mouse button must be clicked in it. Likewise, in
order for a window to loose focus, a mouse button must be order for a window to lose focus, a mouse button must be
clicked outside the window (or in another window). clicked outside the window (or in another window).
Therefore, the Enter and Leave notification provided by GLUT Therefore, the Enter and Leave notification provided by GLUT
may behave differently in the Win32 and in X11 versions. may behave differently in the Win32 and in X11 versions.