Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly.

Browse Source 
Update note in LICENSE accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-10-13 17:57:06 +00:00
parent f601309db5
commit fdda697af7
146 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/SimpleOpenGL/Sample_SimpleOpenGL.c
View File

@@ -339,8 +339,10 @@ int main(int argc, char **argv)
stream = aiGetPredefinedLogStream(aiDefaultLogStream_FILE,"assimp_log.txt");
aiAttachLogStream(&stream);
if( 0 != loadasset( argc >= 2 ? argv[1] : "../../test/models/X/dwarf.x")) {
if( argc != 1 || 0 != loadasset( "../../../../test/models/X/dwarf.x")) {
// the model name can be specified on the command line. we try to locate
// one of the more expressive test models from the repository.
if( 0 != loadasset( argc >= 2 ? argv[1] : "../../test/models-nonbsd/X/dwarf.x")) {
if( argc != 1 || 0 != loadasset( "../../../../test/models-nonbsd/X/dwarf.x") && 0 != loadasset( "../../test/models/X/Testwuson.X")) {
return -1;
}
}