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
ennuma · Oct 13, 2010 · fdda697 · fdda697
1 parent f601309
commit fdda697
Show file tree

Hide file tree

Showing 146 changed files with 43 additions and 23 deletions.
diff --git a/LICENSE b/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 
-<model>.source.txt for more legal information. If you're such a 
-copyright holder and you believe we credited you inproperly or you 
-don't want your files to appear in our repository, contact us.
+their respective creators, which may impose additional requirements
+on the use of their work. For any of these models, see 
+<model-name>.source.txt for more legal information. Contact us if you
+are a copyright holder and believe that we credited you inproperly or 
+if you don't want your files to appear in the repository.
 
diff --git a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c b/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")) {
-		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;
 		}
 	}

diff --git a/samples/SimpleOpenGL/SimpleOpenGL_VC8.sln → samples/SimpleOpenGL/SimpleOpenGL.sln b/samples/SimpleOpenGL/SimpleOpenGL_VC8.sln → samples/SimpleOpenGL/SimpleOpenGL.sln
diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/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 modelname = "dwarf.x";
+static const std::string basepath = "../../test/models/OBJ/";
+static const std::string modelname = "spider.obj";
 
 
 HGLRC		hRC=NULL;			// Permanent Rendering Context

diff --git a/samples/bin/ShowDwarf.bat b/samples/bin/ShowDwarf.bat
@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models-nonbsd\X\dwarf.X
diff --git a/samples/bin/ShowWuson.bat b/samples/bin/ShowWuson.bat
@@ -0,0 +1 @@
+SimpleOpenGL.exe ..\..\test\models\X\Testwuson.X
diff --git a/test/models/3D/mar_rifle.source.txt → test/models-nonbsd/3D/mar_rifle.source.txt b/test/models/3D/mar_rifle.source.txt → test/models-nonbsd/3D/mar_rifle.source.txt
diff --git a/test/models/3D/mar_rifle.uc → test/models-nonbsd/3D/mar_rifle.uc b/test/models/3D/mar_rifle.uc → test/models-nonbsd/3D/mar_rifle.uc
diff --git a/test/models/3D/mar_rifle_a.3d → test/models-nonbsd/3D/mar_rifle_a.3d b/test/models/3D/mar_rifle_a.3d → test/models-nonbsd/3D/mar_rifle_a.3d
diff --git a/test/models/3D/mar_rifle_d.3d → test/models-nonbsd/3D/mar_rifle_d.3d b/test/models/3D/mar_rifle_d.3d → test/models-nonbsd/3D/mar_rifle_d.3d
diff --git a/test/models/3DS/Granate.3DS → test/models-nonbsd/3DS/Granate.3DS b/test/models/3DS/Granate.3DS → test/models-nonbsd/3DS/Granate.3DS
diff --git a/test/models/3DS/cart_wheel.3DS → test/models-nonbsd/3DS/cart_wheel.3DS b/test/models/3DS/cart_wheel.3DS → test/models-nonbsd/3DS/cart_wheel.3DS
diff --git a/test/models/3DS/cart_wheel.source.txt → test/models-nonbsd/3DS/cart_wheel.source.txt b/test/models/3DS/cart_wheel.source.txt → test/models-nonbsd/3DS/cart_wheel.source.txt
diff --git a/test/models/3DS/jeep1.3ds → test/models-nonbsd/3DS/jeep1.3ds b/test/models/3DS/jeep1.3ds → test/models-nonbsd/3DS/jeep1.3ds
diff --git a/test/models/3DS/jeep1.3ds.readme.txt → test/models-nonbsd/3DS/jeep1.3ds.readme.txt b/test/models/3DS/jeep1.3ds.readme.txt → test/models-nonbsd/3DS/jeep1.3ds.readme.txt
diff --git a/test/models/3DS/jeep1.jpg → test/models-nonbsd/3DS/jeep1.jpg b/test/models/3DS/jeep1.jpg → test/models-nonbsd/3DS/jeep1.jpg
diff --git a/test/models/3DS/m_rifl.bmp → test/models-nonbsd/3DS/m_rifl.bmp b/test/models/3DS/m_rifl.bmp → test/models-nonbsd/3DS/m_rifl.bmp
diff --git a/test/models/3DS/mar_rifle.3ds → test/models-nonbsd/3DS/mar_rifle.3ds b/test/models/3DS/mar_rifle.3ds → test/models-nonbsd/3DS/mar_rifle.3ds
diff --git a/test/models/3DS/mar_rifle.source.txt → test/models-nonbsd/3DS/mar_rifle.source.txt b/test/models/3DS/mar_rifle.source.txt → test/models-nonbsd/3DS/mar_rifle.source.txt
diff --git a/test/models/3DS/mp5_sil.3ds → test/models-nonbsd/3DS/mp5_sil.3ds b/test/models/3DS/mp5_sil.3ds → test/models-nonbsd/3DS/mp5_sil.3ds
diff --git a/test/models/3DS/mp5_sil.source.txt → test/models-nonbsd/3DS/mp5_sil.source.txt b/test/models/3DS/mp5_sil.source.txt → test/models-nonbsd/3DS/mp5_sil.source.txt
diff --git a/test/models/3DS/mp5sil.bmp → test/models-nonbsd/3DS/mp5sil.bmp b/test/models/3DS/mp5sil.bmp → test/models-nonbsd/3DS/mp5sil.bmp
diff --git a/test/models/3DS/pyramob.3DS → test/models-nonbsd/3DS/pyramob.3DS b/test/models/3DS/pyramob.3DS → test/models-nonbsd/3DS/pyramob.3DS
diff --git a/test/models/3DS/pyramob.3ds.readme.txt → .../models-nonbsd/3DS/pyramob.3ds.readme.txt b/test/models/3DS/pyramob.3ds.readme.txt → .../models-nonbsd/3DS/pyramob.3ds.readme.txt
diff --git a/test/models/ASE/Rifle.ase → test/models-nonbsd/ASE/Rifle.ase b/test/models/ASE/Rifle.ase → test/models-nonbsd/ASE/Rifle.ase
diff --git a/test/models/ASE/Rifle.source.txt → test/models-nonbsd/ASE/Rifle.source.txt b/test/models/ASE/Rifle.source.txt → test/models-nonbsd/ASE/Rifle.source.txt
diff --git a/test/models/ASE/Rifle2.ase → test/models-nonbsd/ASE/Rifle2.ase b/test/models/ASE/Rifle2.ase → test/models-nonbsd/ASE/Rifle2.ase
diff --git a/test/models/ASE/Rifle2.source.txt → test/models-nonbsd/ASE/Rifle2.source.txt b/test/models/ASE/Rifle2.source.txt → test/models-nonbsd/ASE/Rifle2.source.txt
diff --git a/test/models/B3D/axe.jpg → test/models-nonbsd/B3D/axe.jpg b/test/models/B3D/axe.jpg → test/models-nonbsd/B3D/axe.jpg
diff --git a/test/models/B3D/dwarf.source.txt → test/models-nonbsd/B3D/dwarf.source.txt b/test/models/B3D/dwarf.source.txt → test/models-nonbsd/B3D/dwarf.source.txt
diff --git a/test/models/B3D/dwarf2.b3d → test/models-nonbsd/B3D/dwarf2.b3d b/test/models/B3D/dwarf2.b3d → test/models-nonbsd/B3D/dwarf2.b3d
diff --git a/test/models/B3D/dwarf2.jpg → test/models-nonbsd/B3D/dwarf2.jpg b/test/models/B3D/dwarf2.jpg → test/models-nonbsd/B3D/dwarf2.jpg
diff --git a/test/models/B3D/turtle.source.txt → test/models-nonbsd/B3D/turtle.source.txt b/test/models/B3D/turtle.source.txt → test/models-nonbsd/B3D/turtle.source.txt
diff --git a/test/models/B3D/turtle1.b3d → test/models-nonbsd/B3D/turtle1.b3d b/test/models/B3D/turtle1.b3d → test/models-nonbsd/B3D/turtle1.b3d
diff --git a/test/models/B3D/turtle1.png → test/models-nonbsd/B3D/turtle1.png b/test/models/B3D/turtle1.png → test/models-nonbsd/B3D/turtle1.png
diff --git a/test/models/BLEND/Bob.blend → test/models-nonbsd/BLEND/Bob.blend b/test/models/BLEND/Bob.blend → test/models-nonbsd/BLEND/Bob.blend
diff --git a/test/models/BLEND/bob.source.txt → test/models-nonbsd/BLEND/bob.source.txt b/test/models/BLEND/bob.source.txt → test/models-nonbsd/BLEND/bob.source.txt
diff --git a/test/models/DXF/rifle.dxf → test/models-nonbsd/DXF/rifle.dxf b/test/models/DXF/rifle.dxf → test/models-nonbsd/DXF/rifle.dxf
diff --git a/test/models/DXF/rifle.source.txt → test/models-nonbsd/DXF/rifle.source.txt b/test/models/DXF/rifle.source.txt → test/models-nonbsd/DXF/rifle.source.txt
diff --git a/test/models/HMP/terrain_withtexture.hmp → ...models-nonbsd/HMP/terrain_withtexture.hmp b/test/models/HMP/terrain_withtexture.hmp → ...models-nonbsd/HMP/terrain_withtexture.hmp
diff --git a/test/models/IRR/skybox.xml → test/models-nonbsd/IRR/skybox.xml b/test/models/IRR/skybox.xml → test/models-nonbsd/IRR/skybox.xml
diff --git a/test/models/IRR/skybox/credits.txt → test/models-nonbsd/IRR/skybox/credits.txt b/test/models/IRR/skybox/credits.txt → test/models-nonbsd/IRR/skybox/credits.txt
diff --git a/test/models/IRR/skybox/default_skybox0.jpg → ...els-nonbsd/IRR/skybox/default_skybox0.jpg b/test/models/IRR/skybox/default_skybox0.jpg → ...els-nonbsd/IRR/skybox/default_skybox0.jpg
diff --git a/test/models/IRR/skybox/default_skybox1.jpg → ...els-nonbsd/IRR/skybox/default_skybox1.jpg b/test/models/IRR/skybox/default_skybox1.jpg → ...els-nonbsd/IRR/skybox/default_skybox1.jpg
diff --git a/test/models/IRR/skybox/default_skybox2.jpg → ...els-nonbsd/IRR/skybox/default_skybox2.jpg b/test/models/IRR/skybox/default_skybox2.jpg → ...els-nonbsd/IRR/skybox/default_skybox2.jpg
diff --git a/test/models/IRR/skybox/default_skybox3.jpg → ...els-nonbsd/IRR/skybox/default_skybox3.jpg b/test/models/IRR/skybox/default_skybox3.jpg → ...els-nonbsd/IRR/skybox/default_skybox3.jpg
diff --git a/test/models/IRR/skybox/default_skyboxdn.jpg → ...ls-nonbsd/IRR/skybox/default_skyboxdn.jpg b/test/models/IRR/skybox/default_skyboxdn.jpg → ...ls-nonbsd/IRR/skybox/default_skyboxdn.jpg
diff --git a/test/models/IRR/skybox/default_skyboxup.jpg → ...ls-nonbsd/IRR/skybox/default_skyboxup.jpg b/test/models/IRR/skybox/default_skyboxup.jpg → ...ls-nonbsd/IRR/skybox/default_skyboxup.jpg
diff --git a/...WO2/LWSReferences/MTL_ChromeUniversal.JPG → ...WO2/LWSReferences/MTL_ChromeUniversal.JPG b/...WO2/LWSReferences/MTL_ChromeUniversal.JPG → ...WO2/LWSReferences/MTL_ChromeUniversal.JPG
diff --git a/.../LWSReferences/QuickDraw--Arm-ForeArm.lwo → .../LWSReferences/QuickDraw--Arm-ForeArm.lwo b/.../LWSReferences/QuickDraw--Arm-ForeArm.lwo → .../LWSReferences/QuickDraw--Arm-ForeArm.lwo
diff --git a/...LWSReferences/QuickDraw--Arm-Shoulder.lwo → ...LWSReferences/QuickDraw--Arm-Shoulder.lwo b/...LWSReferences/QuickDraw--Arm-Shoulder.lwo → ...LWSReferences/QuickDraw--Arm-Shoulder.lwo
diff --git a/...LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo → ...LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo b/...LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo → ...LWO2/LWSReferences/QuickDraw--Arm-Tip.lwo
diff --git a/...LWSReferences/QuickDraw--CabinPortals.lwo → ...LWSReferences/QuickDraw--CabinPortals.lwo b/...LWSReferences/QuickDraw--CabinPortals.lwo → ...LWSReferences/QuickDraw--CabinPortals.lwo
diff --git a/.../LWO2/LWSReferences/QuickDraw--Chasis.lwo → .../LWO2/LWSReferences/QuickDraw--Chasis.lwo b/.../LWO2/LWSReferences/QuickDraw--Chasis.lwo → .../LWO2/LWSReferences/QuickDraw--Chasis.lwo
diff --git a/.../LWO2/LWSReferences/QuickDraw--GP-Gun.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Gun.lwo b/.../LWO2/LWSReferences/QuickDraw--GP-Gun.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Gun.lwo
diff --git a/.../LWO2/LWSReferences/QuickDraw--GP-Lid.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Lid.lwo b/.../LWO2/LWSReferences/QuickDraw--GP-Lid.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Lid.lwo
diff --git a/.../LWO2/LWSReferences/QuickDraw--GP-Pod.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Pod.lwo b/.../LWO2/LWSReferences/QuickDraw--GP-Pod.lwo → .../LWO2/LWSReferences/QuickDraw--GP-Pod.lwo
diff --git a/...O2/LWSReferences/QuickDraw--Laserbeam.lwo → ...O2/LWSReferences/QuickDraw--Laserbeam.lwo b/...O2/LWSReferences/QuickDraw--Laserbeam.lwo → ...O2/LWSReferences/QuickDraw--Laserbeam.lwo
diff --git a/...SReferences/QuickDraw--Standin-Driver.lwo → ...SReferences/QuickDraw--Standin-Driver.lwo b/...SReferences/QuickDraw--Standin-Driver.lwo → ...SReferences/QuickDraw--Standin-Driver.lwo
diff --git a/.../LWSReferences/QuickDraw--Wheels-Back.lwo → .../LWSReferences/QuickDraw--Wheels-Back.lwo b/.../LWSReferences/QuickDraw--Wheels-Back.lwo → .../LWSReferences/QuickDraw--Wheels-Back.lwo
diff --git a/...LWSReferences/QuickDraw--Wheels-Front.lwo → ...LWSReferences/QuickDraw--Wheels-Front.lwo b/...LWSReferences/QuickDraw--Wheels-Front.lwo → ...LWSReferences/QuickDraw--Wheels-Front.lwo
diff --git a/...O/LWO2/LWSReferences/QuickDraw.source.txt → ...O/LWO2/LWSReferences/QuickDraw.source.txt b/...O/LWO2/LWSReferences/QuickDraw.source.txt → ...O/LWO2/LWSReferences/QuickDraw.source.txt
diff --git a/test/models/LWO/LWO2/rifle.lwo → test/models-nonbsd/LWO/LWO2/rifle.lwo b/test/models/LWO/LWO2/rifle.lwo → test/models-nonbsd/LWO/LWO2/rifle.lwo
diff --git a/test/models/LWO/LWO2/rifle.source.txt → test/models-nonbsd/LWO/LWO2/rifle.source.txt b/test/models/LWO/LWO2/rifle.source.txt → test/models-nonbsd/LWO/LWO2/rifle.source.txt
diff --git a/test/models/LWS/QuickDraw v.2.2.lws → test/models-nonbsd/LWS/QuickDraw v.2.2.lws b/test/models/LWS/QuickDraw v.2.2.lws → test/models-nonbsd/LWS/QuickDraw v.2.2.lws
diff --git a/...dels/LWS/QuickDraw v.2.2_oldformat_56.lws → ...nbsd/LWS/QuickDraw v.2.2_oldformat_56.lws b/...dels/LWS/QuickDraw v.2.2_oldformat_56.lws → ...nbsd/LWS/QuickDraw v.2.2_oldformat_56.lws
diff --git a/test/models/LWS/QuickDraw v2.2.source.txt → ...dels-nonbsd/LWS/QuickDraw v2.2.source.txt b/test/models/LWS/QuickDraw v2.2.source.txt → ...dels-nonbsd/LWS/QuickDraw v2.2.source.txt
diff --git a/test/models/MD2/dolphin.md2 → test/models-nonbsd/MD2/dolphin.md2 b/test/models/MD2/dolphin.md2 → test/models-nonbsd/MD2/dolphin.md2
diff --git a/test/models/MD2/dolphin_f.bmp → test/models-nonbsd/MD2/dolphin_f.bmp b/test/models/MD2/dolphin_f.bmp → test/models-nonbsd/MD2/dolphin_f.bmp
diff --git a/test/models/MD2/flag.md2 → test/models-nonbsd/MD2/flag.md2 b/test/models/MD2/flag.md2 → test/models-nonbsd/MD2/flag.md2
diff --git a/test/models/MD2/horse.md2 → test/models-nonbsd/MD2/horse.md2 b/test/models/MD2/horse.md2 → test/models-nonbsd/MD2/horse.md2
diff --git a/test/models/MD2/source.txt → test/models-nonbsd/MD2/source.txt b/test/models/MD2/source.txt → test/models-nonbsd/MD2/source.txt
diff --git a/.../mapobjects/kt_kubalwagon/euro_frnt_2.tga → .../mapobjects/kt_kubalwagon/euro_frnt_2.tga b/.../mapobjects/kt_kubalwagon/euro_frnt_2.tga → .../mapobjects/kt_kubalwagon/euro_frnt_2.tga
diff --git a/...mapobjects/kt_kubalwagon/european_fnt.tga → ...mapobjects/kt_kubalwagon/european_fnt.tga b/...mapobjects/kt_kubalwagon/european_fnt.tga → ...mapobjects/kt_kubalwagon/european_fnt.tga
diff --git a/...objects/kt_kubalwagon/european_fnt_v2.md3 → ...objects/kt_kubalwagon/european_fnt_v2.md3 b/...objects/kt_kubalwagon/european_fnt_v2.md3 → ...objects/kt_kubalwagon/european_fnt_v2.md3
diff --git a/...jects/kt_kubalwagon/readme_kubalwagon.txt → ...jects/kt_kubalwagon/readme_kubalwagon.txt b/...jects/kt_kubalwagon/readme_kubalwagon.txt → ...jects/kt_kubalwagon/readme_kubalwagon.txt
diff --git a/...s/MD3/q3root/scripts/kt_kubalwagon.shader → ...d/MD3/q3root/scripts/kt_kubalwagon.shader b/...s/MD3/q3root/scripts/kt_kubalwagon.shader → ...d/MD3/q3root/scripts/kt_kubalwagon.shader
diff --git a/test/models/MD3/readme_water.txt → test/models-nonbsd/MD3/readme_water.txt b/test/models/MD3/readme_water.txt → test/models-nonbsd/MD3/readme_water.txt
diff --git a/test/models/MD3/water_can.tga → test/models-nonbsd/MD3/water_can.tga b/test/models/MD3/water_can.tga → test/models-nonbsd/MD3/water_can.tga
diff --git a/test/models/MD3/watercan.md3 → test/models-nonbsd/MD3/watercan.md3 b/test/models/MD3/watercan.md3 → test/models-nonbsd/MD3/watercan.md3
diff --git a/test/models/MD3/watercan_dmg.md3 → test/models-nonbsd/MD3/watercan_dmg.md3 b/test/models/MD3/watercan_dmg.md3 → test/models-nonbsd/MD3/watercan_dmg.md3
diff --git a/test/models/MD5/BoarMan.md5mesh → test/models-nonbsd/MD5/BoarMan.md5mesh b/test/models/MD5/BoarMan.md5mesh → test/models-nonbsd/MD5/BoarMan.md5mesh
diff --git a/test/models/MD5/BoarMan.source.txt → test/models-nonbsd/MD5/BoarMan.source.txt b/test/models/MD5/BoarMan.source.txt → test/models-nonbsd/MD5/BoarMan.source.txt
diff --git a/test/models/MD5/Bob.md5anim → test/models-nonbsd/MD5/Bob.md5anim b/test/models/MD5/Bob.md5anim → test/models-nonbsd/MD5/Bob.md5anim
diff --git a/test/models/MD5/Bob.md5mesh → test/models-nonbsd/MD5/Bob.md5mesh b/test/models/MD5/Bob.md5mesh → test/models-nonbsd/MD5/Bob.md5mesh
diff --git a/test/models/MD5/bob.source.txt → test/models-nonbsd/MD5/bob.source.txt b/test/models/MD5/bob.source.txt → test/models-nonbsd/MD5/bob.source.txt
diff --git a/test/models/MD5/guard1_body.png → test/models-nonbsd/MD5/guard1_body.png b/test/models/MD5/guard1_body.png → test/models-nonbsd/MD5/guard1_body.png
diff --git a/test/models/MD5/guard1_face.png → test/models-nonbsd/MD5/guard1_face.png b/test/models/MD5/guard1_face.png → test/models-nonbsd/MD5/guard1_face.png
diff --git a/test/models/MD5/guard1_helmet.png → test/models-nonbsd/MD5/guard1_helmet.png b/test/models/MD5/guard1_helmet.png → test/models-nonbsd/MD5/guard1_helmet.png
diff --git a/test/models/MD5/iron_grill.png → test/models-nonbsd/MD5/iron_grill.png b/test/models/MD5/iron_grill.png → test/models-nonbsd/MD5/iron_grill.png
diff --git a/test/models/MD5/round_grill.png → test/models-nonbsd/MD5/round_grill.png b/test/models/MD5/round_grill.png → test/models-nonbsd/MD5/round_grill.png
diff --git a/...models/MDL/IDPO (Quake1)/gijoe-readme.txt → ...nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt b/...models/MDL/IDPO (Quake1)/gijoe-readme.txt → ...nonbsd/MDL/IDPO (Quake1)/gijoe-readme.txt
diff --git a/test/models/MDL/IDPO (Quake1)/gijoe.mdl → ...models-nonbsd/MDL/IDPO (Quake1)/gijoe.mdl b/test/models/MDL/IDPO (Quake1)/gijoe.mdl → ...models-nonbsd/MDL/IDPO (Quake1)/gijoe.mdl
diff --git a/test/models/MDL/IDPO (Quake1)/steg.mdl → .../models-nonbsd/MDL/IDPO (Quake1)/steg.mdl b/test/models/MDL/IDPO (Quake1)/steg.mdl → .../models-nonbsd/MDL/IDPO (Quake1)/steg.mdl
diff --git a/test/models/MDL/IDPO (Quake1)/steg.txt → .../models-nonbsd/MDL/IDPO (Quake1)/steg.txt b/test/models/MDL/IDPO (Quake1)/steg.txt → .../models-nonbsd/MDL/IDPO (Quake1)/steg.txt
diff --git a/test/models/MDL/IDPO (Quake1)/tekmechbot.MDL → ...s-nonbsd/MDL/IDPO (Quake1)/tekmechbot.MDL b/test/models/MDL/IDPO (Quake1)/tekmechbot.MDL → ...s-nonbsd/MDL/IDPO (Quake1)/tekmechbot.MDL
diff --git a/test/models/MDL/IDPO (Quake1)/tekmechbot.txt → ...s-nonbsd/MDL/IDPO (Quake1)/tekmechbot.txt b/test/models/MDL/IDPO (Quake1)/tekmechbot.txt → ...s-nonbsd/MDL/IDPO (Quake1)/tekmechbot.txt
diff --git a/...dels/MDL/MDL7 (3DGS A7)/barkD_texture.bmp → ...nbsd/MDL/MDL7 (3DGS A7)/barkD_texture.bmp b/...dels/MDL/MDL7 (3DGS A7)/barkD_texture.bmp → ...nbsd/MDL/MDL7 (3DGS A7)/barkD_texture.bmp
diff --git a/...ls/MDL/MDL7 (3DGS A7)/branchD_texture.png → ...sd/MDL/MDL7 (3DGS A7)/branchD_texture.png b/...ls/MDL/MDL7 (3DGS A7)/branchD_texture.png → ...sd/MDL/MDL7 (3DGS A7)/branchD_texture.png
diff --git a/...s/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl → ...d/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl b/...s/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl → ...d/MDL/MDL7 (3DGS A7)/broadleavedtreeD.mdl
diff --git a/...DL7 (3DGS A7)/broadleavedtreeD_readme.rtf → ...DL7 (3DGS A7)/broadleavedtreeD_readme.rtf b/...DL7 (3DGS A7)/broadleavedtreeD_readme.rtf → ...DL7 (3DGS A7)/broadleavedtreeD_readme.rtf
diff --git a/test/models/NFF/NFFSense8/HOME4.NFF → test/models-nonbsd/NFF/NFFSense8/HOME4.NFF b/test/models/NFF/NFFSense8/HOME4.NFF → test/models-nonbsd/NFF/NFFSense8/HOME4.NFF
diff --git a/test/models/NFF/NFFSense8/WithMaterial.mat → ...els-nonbsd/NFF/NFFSense8/WithMaterial.mat b/test/models/NFF/NFFSense8/WithMaterial.mat → ...els-nonbsd/NFF/NFFSense8/WithMaterial.mat
diff --git a/test/models/NFF/NFFSense8/cokecan.mat → test/models-nonbsd/NFF/NFFSense8/cokecan.mat b/test/models/NFF/NFFSense8/cokecan.mat → test/models-nonbsd/NFF/NFFSense8/cokecan.mat
diff --git a/test/models/NFF/NFFSense8/cokecan.nff → test/models-nonbsd/NFF/NFFSense8/cokecan.nff b/test/models/NFF/NFFSense8/cokecan.nff → test/models-nonbsd/NFF/NFFSense8/cokecan.nff
diff --git a/test/models/NFF/NFFSense8/credits.txt → test/models-nonbsd/NFF/NFFSense8/credits.txt b/test/models/NFF/NFFSense8/credits.txt → test/models-nonbsd/NFF/NFFSense8/credits.txt
diff --git a/test/models/NFF/NFFSense8/teapot.nff → test/models-nonbsd/NFF/NFFSense8/teapot.nff b/test/models/NFF/NFFSense8/teapot.nff → test/models-nonbsd/NFF/NFFSense8/teapot.nff
diff --git a/test/models/OBJ/rifle.mtl → test/models-nonbsd/OBJ/rifle.mtl b/test/models/OBJ/rifle.mtl → test/models-nonbsd/OBJ/rifle.mtl
diff --git a/test/models/OBJ/rifle.obj → test/models-nonbsd/OBJ/rifle.obj b/test/models/OBJ/rifle.obj → test/models-nonbsd/OBJ/rifle.obj
diff --git a/test/models/OBJ/rifle.source.txt → test/models-nonbsd/OBJ/rifle.source.txt b/test/models/OBJ/rifle.source.txt → test/models-nonbsd/OBJ/rifle.source.txt
@@ -6,7 +6,7 @@ Model copyright: Elias Tsiantas
 =====================================================================
 
 Downloaded 4th November 2008 (Obama ftw!).
-Notice found on the page:
+Notices found on the page:
 
 "
 Free the models is a site that offers free 3d models in 3ds, bryce, poser,
@@ -17,6 +17,10 @@ sections such as wallpapers, 3d screensavers, 3d coding source code and
 tutorials.
 "
 
+"
+'Free the models' is a site dedicated to provide free content for 3d applications and 3d/game engines. The license of the content is that what you download from here is one step away from public domain. So, everything you download from here is free for any use EXCEPT it cannot be included in another free web or cd collection and it cannot be sold. Otherwise you can use it in your commercial game, 3d application or render work. You don't have to provide credit but It would be nice if you do.
+"
+
 INFO
 ====
 

diff --git a/test/models/OBJ/segment.mtl → test/models-nonbsd/OBJ/segment.mtl b/test/models/OBJ/segment.mtl → test/models-nonbsd/OBJ/segment.mtl
diff --git a/test/models/OBJ/segment.obj → test/models-nonbsd/OBJ/segment.obj b/test/models/OBJ/segment.obj → test/models-nonbsd/OBJ/segment.obj
diff --git a/test/models/OBJ/segment.source.txt → test/models-nonbsd/OBJ/segment.source.txt b/test/models/OBJ/segment.source.txt → test/models-nonbsd/OBJ/segment.source.txt
diff --git a/...odels/Ogre/Animationtest/Arm.skeleton.xml → ...onbsd/Ogre/Animationtest/Arm.skeleton.xml b/...odels/Ogre/Animationtest/Arm.skeleton.xml → ...onbsd/Ogre/Animationtest/Arm.skeleton.xml
diff --git a/test/models/Ogre/Animationtest/Cube.mesh.xml → ...s-nonbsd/Ogre/Animationtest/Cube.mesh.xml b/test/models/Ogre/Animationtest/Cube.mesh.xml → ...s-nonbsd/Ogre/Animationtest/Cube.mesh.xml
diff --git a/.../models/Ogre/Animationtest/Scene.material → ...-nonbsd/Ogre/Animationtest/Scene.material b/.../models/Ogre/Animationtest/Scene.material → ...-nonbsd/Ogre/Animationtest/Scene.material
diff --git a/test/models/Ogre/Assassine/Axt.mesh.xml → ...models-nonbsd/Ogre/Assassine/Axt.mesh.xml b/test/models/Ogre/Assassine/Axt.mesh.xml → ...models-nonbsd/Ogre/Assassine/Axt.mesh.xml
diff --git a/test/models/Ogre/Assassine/Axt.skeleton.xml → ...ls-nonbsd/Ogre/Assassine/Axt.skeleton.xml b/test/models/Ogre/Assassine/Axt.skeleton.xml → ...ls-nonbsd/Ogre/Assassine/Axt.skeleton.xml
diff --git a/test/models/Ogre/Assassine/DesertEagle.tga → ...els-nonbsd/Ogre/Assassine/DesertEagle.tga b/test/models/Ogre/Assassine/DesertEagle.tga → ...els-nonbsd/Ogre/Assassine/DesertEagle.tga
diff --git a/test/models/Ogre/Assassine/Koerper.mesh.xml → ...ls-nonbsd/Ogre/Assassine/Koerper.mesh.xml b/test/models/Ogre/Assassine/Koerper.mesh.xml → ...ls-nonbsd/Ogre/Assassine/Koerper.mesh.xml
diff --git a/...odels/Ogre/Assassine/Koerper.skeleton.xml → ...onbsd/Ogre/Assassine/Koerper.skeleton.xml b/...odels/Ogre/Assassine/Koerper.skeleton.xml → ...onbsd/Ogre/Assassine/Koerper.skeleton.xml
diff --git a/test/models/Ogre/Assassine/Pistol.mesh.xml → ...els-nonbsd/Ogre/Assassine/Pistol.mesh.xml b/test/models/Ogre/Assassine/Pistol.mesh.xml → ...els-nonbsd/Ogre/Assassine/Pistol.mesh.xml
diff --git a/...models/Ogre/Assassine/Pistol.skeleton.xml → ...nonbsd/Ogre/Assassine/Pistol.skeleton.xml b/...models/Ogre/Assassine/Pistol.skeleton.xml → ...nonbsd/Ogre/Assassine/Pistol.skeleton.xml
diff --git a/test/models/Ogre/Assassine/PlayerTextur.tga → ...ls-nonbsd/Ogre/Assassine/PlayerTextur.tga b/test/models/Ogre/Assassine/PlayerTextur.tga → ...ls-nonbsd/Ogre/Assassine/PlayerTextur.tga
diff --git a/test/models/Ogre/Assassine/Scene.material → ...dels-nonbsd/Ogre/Assassine/Scene.material b/test/models/Ogre/Assassine/Scene.material → ...dels-nonbsd/Ogre/Assassine/Scene.material
diff --git a/test/models/Ogre/Assassine/axt.tga → test/models-nonbsd/Ogre/Assassine/axt.tga b/test/models/Ogre/Assassine/axt.tga → test/models-nonbsd/Ogre/Assassine/axt.tga
diff --git a/test/models/Ogre/Gravestone/Sarg.material → ...dels-nonbsd/Ogre/Gravestone/Sarg.material b/test/models/Ogre/Gravestone/Sarg.material → ...dels-nonbsd/Ogre/Gravestone/Sarg.material
diff --git a/test/models/Ogre/Gravestone/Sarg.mesh.xml → ...dels-nonbsd/Ogre/Gravestone/Sarg.mesh.xml b/test/models/Ogre/Gravestone/Sarg.mesh.xml → ...dels-nonbsd/Ogre/Gravestone/Sarg.mesh.xml
diff --git a/test/models/Ogre/Gravestone/SargTextur.tga → ...els-nonbsd/Ogre/Gravestone/SargTextur.tga b/test/models/Ogre/Gravestone/SargTextur.tga → ...els-nonbsd/Ogre/Gravestone/SargTextur.tga
diff --git a/.../Ogre/animationtest2/Animationtest2.blend → .../Ogre/animationtest2/Animationtest2.blend b/.../Ogre/animationtest2/Animationtest2.blend → .../Ogre/animationtest2/Animationtest2.blend
diff --git a/...Ogre/animationtest2/Animationtest2.blend1 → ...Ogre/animationtest2/Animationtest2.blend1 b/...Ogre/animationtest2/Animationtest2.blend1 → ...Ogre/animationtest2/Animationtest2.blend1
diff --git a/.../models/Ogre/animationtest2/Cube.mesh.xml → ...-nonbsd/Ogre/animationtest2/Cube.mesh.xml b/.../models/Ogre/animationtest2/Cube.mesh.xml → ...-nonbsd/Ogre/animationtest2/Cube.mesh.xml
diff --git a/...els/Ogre/animationtest2/Cube.skeleton.xml → ...bsd/Ogre/animationtest2/Cube.skeleton.xml b/...els/Ogre/animationtest2/Cube.skeleton.xml → ...bsd/Ogre/animationtest2/Cube.skeleton.xml
diff --git a/...models/Ogre/animationtest2/Scene.material → ...nonbsd/Ogre/animationtest2/Scene.material b/...models/Ogre/animationtest2/Scene.material → ...nonbsd/Ogre/animationtest2/Scene.material
diff --git a/test/models/PK3/SGDTT3.pk3 → test/models-nonbsd/PK3/SGDTT3.pk3 b/test/models/PK3/SGDTT3.pk3 → test/models-nonbsd/PK3/SGDTT3.pk3
diff --git a/test/models-nonbsd/README.txt b/test/models-nonbsd/README.txt
@@ -0,0 +1,3 @@
+These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).
+
+So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.
diff --git a/test/models/X/axe.jpg → test/models-nonbsd/X/axe.jpg b/test/models/X/axe.jpg → test/models-nonbsd/X/axe.jpg
diff --git a/test/models/X/dwarf-Read-Me.txt → test/models-nonbsd/X/dwarf-Read-Me.txt b/test/models/X/dwarf-Read-Me.txt → test/models-nonbsd/X/dwarf-Read-Me.txt
diff --git a/test/models/X/dwarf.jpg → test/models-nonbsd/X/dwarf.jpg b/test/models/X/dwarf.jpg → test/models-nonbsd/X/dwarf.jpg
diff --git a/test/models/X/dwarf.x → test/models-nonbsd/X/dwarf.x b/test/models/X/dwarf.x → test/models-nonbsd/X/dwarf.x
diff --git a/test/models/ASE/MotionCaptureROM.source.txt b/test/models/ASE/MotionCaptureROM.source.txt
@@ -1,3 +1,3 @@
-"MotionCaptureROM.ase" - Recorded using Vicon IQ. 
+"MotionCaptureROM.ase" - Free for any purpose. 
 
-NOTE: The errors in the middle of the animation are caused by problems during recording.
+NOTE: The errors in the middle of the animation are caused by problems during recording, it's not an importer issue.
diff --git a/test/models/BLEND/HUMAN.source.txt b/test/models/BLEND/HUMAN.source.txt
@@ -1,3 +1,3 @@
 HUMAN.blend (c) 2010, Tobias Rittig
 
-Redistribution and reuse allowed, credits appreciated.
+Redistribution and reuse allowed for any purpose, credits appreciated.
diff --git a/test/regression/db.zip b/test/regression/db.zip
diff --git a/test/regression/settings.py b/test/regression/settings.py
@@ -86,7 +86,8 @@
 # List of directories to be processed. Paths are processed recursively.
 # -------------------------------------------------------------------------------
 model_directories = [
-os.path.join("..","models")
+os.path.join("..","models"),
+os.path.join("..","models-nonbsd")
 ]
 
 # -------------------------------------------------------------------------------

diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
@@ -195,12 +195,12 @@ void  ImporterTest :: testMultipleReads (void)
 		aiProcess_OptimizeGraph;
 
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/test.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/Testwuson.x",flags));
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/anim_test.x",flags));
 	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/bcn_epileptic.x",flags));
-	CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags));
+	//CPPUNIT_ASSERT(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
 }
diff --git a/workspaces/vc9/assimp.sln b/workspaces/vc9/assimp.sln
@@ -107,6 +107,7 @@ Global
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|x64.Build.0 = debug|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|Win32.ActiveCfg = debug-dll|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|x64.ActiveCfg = debug-dll|x64
+		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|x64.Build.0 = debug-dll|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|Win32.ActiveCfg = debug-noboost-st|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|Win32.Build.0 = debug-noboost-st|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|x64
@@ -136,26 +137,32 @@ Global
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|x64.ActiveCfg = Debug|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.ActiveCfg = debug-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.Build.0 = debug-dll|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.ActiveCfg = debug-dll|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.ActiveCfg = debug-dll|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.Build.0 = debug-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|Win32.ActiveCfg = debug-noboost-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|Win32.Build.0 = debug-noboost-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.ActiveCfg = debug-noboost-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-noboost-st|x64.Build.0 = debug-noboost-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|Win32.ActiveCfg = debug-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|Win32.Build.0 = debug-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.ActiveCfg = debug-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.ActiveCfg = debug-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-st|x64.Build.0 = debug-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|Win32.ActiveCfg = Release|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|Win32.Build.0 = Release|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.ActiveCfg = Release|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.ActiveCfg = Release|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release|x64.Build.0 = Release|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|Win32.ActiveCfg = release-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|Win32.Build.0 = release-dll|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|x64.ActiveCfg = release-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-dll|x64.Build.0 = release-dll|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|Win32.ActiveCfg = release-noboost-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|Win32.Build.0 = release-noboost-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.ActiveCfg = release-noboost-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.ActiveCfg = release-noboost-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-noboost-st|x64.Build.0 = release-noboost-st|x64
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|Win32.ActiveCfg = release-st|Win32
 		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|Win32.Build.0 = release-st|Win32
-		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.ActiveCfg = release-st|Win32
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.ActiveCfg = release-st|x64
+		{7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.release-st|x64.Build.0 = release-st|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SimpleOpenGL.exe ..\..\test\models-nonbsd\X\dwarf.X
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SimpleOpenGL.exe ..\..\test\models\X\Testwuson.X
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		These models are not generally redistributable under the terms of Assimp's BSD license. Usually, an additional requirement on the use of the data is imposed (i.e. no commercial use, need credits, some creative commons variants, ...).

		So, if you re-package Assimp for use in a 'clean' OSS package, consider removing this directory.