Merge branch 'file_structure'

.gitignore

@@ -2,7 +2,7 @@
 __pycache__
 
 *.blend[0-9]
-tests/exports/*.escn
+tests/godot_project/exports/*.escn
 
 .import 
 *.import

Makefile

@@ -7,16 +7,15 @@ GODOT = godot
 
 pylint:
 	$(PYLINT) io_scene_godot
-	$(PYLINT) io_scene_godot
 
 pep8:
 	$(PEP8) io_scene_godot
 
 
 export-blends:
-	mkdir -p ./tests/exports/
-	rm -rf ./tests/.import  # Ensure we don't have any hangover data
-	$(BLENDER) -b --python ./tests/scenes/export_blends.py
+	mkdir -p ./tests/godot_project/exports/
+	rm -rf ./tests/godot_project/.import  # Ensure we don't have any hangover data
+	$(BLENDER) -b --python ./tests/export_test_scenes.py
 
 
 test-import: export-blends
@@ -26,11 +25,11 @@ test-import: export-blends
 
 
 update-examples:
-	mkdir -p tests/reference-exports
-	cp tests/exports/*.escn tests/reference-exports
-	
+	mkdir -p tests/reference_exports
+	cp tests/godot_project/exports/*.escn tests/reference_exports
+
 compare: export-blends
-	diff -x "*.escn.import" -r tests/exports/ tests/reference-exports/
+	diff -x "*.escn.import" -r tests/godot_project/exports/ tests/reference_exports/
 
 
 style-test: pep8 pylint

tests/scenes/export_blends.py → tests/export_test_scenes.py

@@ -14,7 +14,7 @@ def export_escn(out_file):
 
 
 def main():
-    target_dir = os.path.join(os.getcwd(), "tests/scenes")
+    target_dir = os.path.join(os.getcwd(), "tests/test_scenes")
     for file_name in os.listdir(target_dir):
         full_path = os.path.join(target_dir, file_name)
         if full_path.endswith(".blend"):
@@ -22,9 +22,9 @@ def main():
             bpy.ops.wm.open_mainfile(filepath=full_path)
 
             out_path, blend_name = os.path.split(full_path)
-            out_path = os.path.normpath(os.path.join(out_path, '../exports/'))
             out_path = os.path.join(
                 out_path,
+                '../godot_project/exports/',
                 blend_name.replace('.blend', '.escn')
                 )
             print(out_path)