Path fixes

blender/armutils.py

@@ -57,8 +57,11 @@ def get_sdk_path():
     if with_krom() and addon_prefs.sdk_bundled:
         if get_os() == 'mac':
             # SDK on MacOS is located in .app folder due to security
-            # blender.app/Contents/MacOS/blender
-            return bpy.app.binary_path[:-22] + '/armsdk/'
+            p = bpy.app.binary_path
+            if p.endswith('Contents/MacOS/blender'):
+                return p[:-len('Contents/MacOS/blender')] + '/armsdk/'
+            else:
+                return p[:-len('Contents/MacOS/./blender')] + '/armsdk/'
         elif get_os() == 'linux':
             # /blender
             return bpy.app.binary_path.rsplit('/', 1)[0] + '/armsdk/'

blender/make_world.py

@@ -120,8 +120,15 @@ def parse_world_output(world, node, context):
         parse_surface(world, surface_node, context)
     
 def parse_surface(world, node, context):
+    wrd = bpy.data.worlds['Arm']
+    
     # Extract environment strength
     if node.type == 'BACKGROUND':
+        
+        # Append irradiance define
+        if wrd.generate_irradiance:
+            bpy.data.worlds['Arm'].world_defs += '_Irr'
+
         # Strength
         envmap_strength_const = {}
         envmap_strength_const['name'] = 'envmapStrength'
@@ -140,10 +147,6 @@ def parse_surface(world, node, context):
 def parse_color(world, node, context, envmap_strength_const):       
     wrd = bpy.data.worlds['Arm']
 
-    # Append irradiance define
-    if wrd.generate_irradiance:
-        bpy.data.worlds['Arm'].world_defs += '_Irr'
-
     # Env map included
     if node.type == 'TEX_ENVIRONMENT' and node.image != None:
 

blender/props.py

@@ -74,6 +74,7 @@ def init_properties():
         items = [('Disabled', 'Disabled', 'Disabled'), 
                  ('Recast', 'Recast', 'Recast')],
         name = "Navigation", default='Recast')
+    bpy.types.World.arm_engine_on = bpy.props.BoolProperty(name="Armory On", description="Armory engine enabled", default=True)
     bpy.types.World.arm_ui = BoolProperty(name="ArmUI", description="Include ArmUI library", default=False)
     bpy.types.World.arm_khafile = StringProperty(name = "Khafile", description="Source appended to khafile.js")
     bpy.types.World.arm_command_line = StringProperty(name = "Command Line", description="Commands appended to khamake")

blender/start.py

@@ -15,7 +15,11 @@ import space_armory
 import armutils
 import keymap
 
+registered = False
+
 def register():
+    global registered
+    registered = True
     armutils.register()
     props_traits_action.register()
     props_traits_clip.register()
@@ -33,6 +37,8 @@ def register():
     keymap.register()
 
 def unregister():
+    global registered
+    registered = False
     keymap.unregister()
     armutils.unregister()
     nodes_logic.unregister()

blender/write_data.py

@@ -5,7 +5,7 @@ import armutils
 import make_state as state
 
 def add_armory_library(sdk_path, name):
-    return ('project.addLibrary("../' + bpy.path.relpath(sdk_path + '/' + name)[2:] + '");\n').replace('\\', '/')
+    return ('project.addLibrary("' + sdk_path + '/' + name + '");\n').replace('\\', '/')
 
 # Write khafile.js
 def write_khafilejs(is_play, export_physics, export_navigation, dce_full=False):