Merge pull request #2124 from Naxela/master

Fix for material NoneType and fix for Blender exit error

blender/arm/keymap.py

@@ -17,6 +17,8 @@ def register():
 
     km = addon_keyconfig.keymaps.new(name='Window', space_type='EMPTY', region_type="WINDOW")
     km.keymap_items.new(props_ui.ArmoryPlayButton.bl_idname, type='F5', value='PRESS')
+    km.keymap_items.new("tlm.build_lightmaps", type='F6', value='PRESS')
+    km.keymap_items.new("tlm.clean_lightmaps", type='F7', value='PRESS')
     arm_keymaps.append(km)
 
 def unregister():

blender/arm/lightmapper/keymap/__init__.py

@@ -1,7 +0,0 @@
-from . import keymap
-
-def register():
-    keymap.register()
-
-def unregister():
-    keymap.unregister()

blender/arm/make_renderpath.py

@@ -373,8 +373,11 @@ def build():
         if obj.type == "MESH":
             for slot in obj.material_slots:
                 mat = slot.material
-                if mat.arm_ignore_irradiance:
-                    ignoreIrr = True
+
+                if mat: #Check if not NoneType
+
+                    if mat.arm_ignore_irradiance:
+                        ignoreIrr = True
 
     if ignoreIrr:
         wrd.world_defs += '_IgnoreIrr'

blender/arm/props_bake.py

@@ -3,7 +3,7 @@ import arm.assets
 import bpy
 from bpy.types import Menu, Panel, UIList
 from bpy.props import *
-from arm.lightmapper import operators, properties, utility, keymap
+from arm.lightmapper import operators, properties, utility
 
 class ArmBakeListItem(bpy.types.PropertyGroup):
     obj: PointerProperty(type=bpy.types.Object, description="The object to bake")
@@ -361,7 +361,6 @@ def register():
 
     operators.register()
     properties.register()
-    keymap.register()
 
 def unregister():
     bpy.utils.unregister_class(ArmBakeListItem)
@@ -380,5 +379,4 @@ def unregister():
     #Unregister lightmapper
 
     operators.unregister()
-    properties.unregister()
-    keymap.unregister()
+    properties.unregister()