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

Update note in LICENSE accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

LICENSE

@@ -36,11 +36,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 
-AN EXCEPTION applies to all files in the ./test/models subfolder.
+AN EXCEPTION applies to all files in the ./test/models-nonbsd subfolder.
 These are 3d models for testing purposes, from various free sources
 on the internet. They are - unless otherwise stated - copyright of
-their respective creators. For a specific 3d model, see 
+their respective creators, which may impose additional requirements
-<model>.source.txt for more legal information. If you're such a 
+on the use of their work. For any of these models, see 
-copyright holder and you believe we credited you inproperly or you 
+<model-name>.source.txt for more legal information. Contact us if you
-don't want your files to appear in our repository, contact us.
+are a copyright holder and believe that we credited you inproperly or 
+if you don't want your files to appear in the repository.
 

samples/SimpleOpenGL/Sample_SimpleOpenGL.c

@@ -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")) {
+	// the model name can be specified on the command line. we try to locate
-		if( argc != 1 || 0 != loadasset( "../../../../test/models/X/dwarf.x")) { 
+	// 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;
 		}
 	}

samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp

@@ -37,8 +37,8 @@
 
 
 // currently these are hardcoded
-static const std::string basepath = "../../test/models/X/";
+static const std::string basepath = "../../test/models/OBJ/";
-static const std::string modelname = "dwarf.x";
+static const std::string modelname = "spider.obj";
 
 
 HGLRC		hRC=NULL;			// Permanent Rendering Context

samples/bin/ShowDwarf.bat

@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models-nonbsd\X\dwarf.X

samples/bin/ShowWuson.bat

@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models\X\Testwuson.X