Merge pull request #19 from sdfgeoff/validate-which-exporter-is-used

Added warning for if there is a version installed in blender

Author: sdfgeoff

Makefile

@@ -3,8 +3,8 @@
 
 assets:
 	rm -r assets || true
-	blender -b test_scenes/Cube.blend --python export.py -- --output-file="assets/scenes/Cube.scn"
-	blender -b test_scenes/PhysicsTest.blend --python export.py -- --output-file="assets/scenes/PhysicsTest.scn"
+	blender -b test_scenes/Cube.blend --python export.py -- --output-file="assets/scenes/Cube.scn" --log-level=DEBUG
+	blender -b test_scenes/PhysicsTest.blend --python export.py -- --output-file="assets/scenes/PhysicsTest.scn" --log-level=DEBUG
 
 run:
 	cargo run --example scenes

blender_bevy_toolkit/__init__.py

@@ -43,7 +43,7 @@ def draw(self, context):
 
 
 def register():
-    logger.info({"event":"registering_bevy_addon", "state":"start"})
+    logger.info(jdict(event="registering_bevy_addon", state="start"))
     bpy.utils.register_class(BevyComponentsPanel)
     bpy.utils.register_class(operators.RemoveBevyComponent)
     bpy.utils.register_class(operators.AddBevyComponent)

export.py

@@ -11,16 +11,28 @@
 import traceback
 import argparse
 
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-import blender_bevy_toolkit
+import logging
 
 
 def export_all(args):
     parser = argparse.ArgumentParser()
     parser.add_argument('--output-file', help="Output all data to here", 
 required=True)
+    parser.add_argument('--log-level', help="Log level. One of: 'DEBUG', 'INFO', 'WARNING', 'ERROR' or CRITICAL", default='WARNING')
     config = parser.parse_args(args)
 
+    logging.basicConfig(level=config.log_level)
+
+
+    try:
+        import blender_bevy_toolkit
+        print("WARNING: Plugin is installed in blender, using installed version for export")
+    except ImportError:
+        sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+        import blender_bevy_toolkit
+        blender_bevy_toolkit.register()
+        blender_bevy_toolkit.load_handler(None)
+
     blender_bevy_toolkit.do_export({
         "output_filepath": config.output_file,
         "mesh_output_folder": "meshes",