Merge pull request #13 from MBCollector672/patch-3

fix crash if dif has interiorPathFollowers but no pathedInteriors

Author: RandomityGuy

blender_plugin/io_dif/import_dif.py

@@ -519,81 +519,82 @@ def load(
         obj.matrix_world = global_matrix
 
     for mover in dif.interiorPathfollowers:
-        pos = mover.offset
-        itr = pathedInteriors[mover.interiorResIndex]
-        itr: Object = itr.copy()
-        base = scene.collection.objects.link(itr)
-        itr.location = [-pos.x, -pos.y, -pos.z]
-        itr.dif_props.interior_type = "pathed_interior"
-        itr.dif_props.start_time = int(mover.properties.h.get("initialPosition", 0))
-        itr.dif_props.reverse = mover.properties.h.get("initialTargetPosition", 0) == "-2"
-        itr.dif_props.constant_speed = False
-
-        waypoints: list[WayPoint] = mover.wayPoint
-
-        markerpts = [
-            (waypt.position.x, waypt.position.y, waypt.position.z)
-            for waypt in waypoints
-        ]
-
-        curve = bpy.data.curves.new("markers", type="CURVE")
-        curve.dimensions = "3D"
-        spline = curve.splines.new(type="POLY")
-        spline.points.add(len(markerpts) - 1)
-
-        for p, new_co in zip(spline.points, markerpts):
-            p.co = new_co + (1.0,)
-
-        path = bpy.data.objects.new("path", curve)
-        scene.collection.objects.link(path)
-
-        itr.dif_props.marker_path = curve
-
-        total_time = 0
-        for pt in waypoints:
-            total_time += pt.msToNext
-        itr.dif_props.total_time = total_time
-
-        if len(waypoints) > 0:
-            first_type = waypoints[0].smoothingType
-            if first_type == 0:
-                itr.dif_props.marker_type = "linear"
-            elif first_type == 1:
-                itr.dif_props.marker_type = "spline"
-            elif first_type == 2:
-                itr.dif_props.marker_type = "accelerate"
-        else:
-            itr.dif_props.marker_type = "linear"
-            
-        if len(dif.triggers) > 0:    
-            for trigger_id in mover.triggerId:
-                trigger = dif.triggers[trigger_id]
-                tobj = bpy.data.objects.new(trigger.datablock, None)
-                tobj.dif_props.interior_type = "path_trigger"
-                tobj.dif_props.pathed_interior_target = itr
-                tobj.dif_props.game_entity_datablock = trigger.datablock
-                tobj.dif_props.target_marker = False
-                for key in trigger.properties.h:
-                    prop = tobj.dif_props.game_entity_properties.add()
-                    prop.key = key
-                    prop.value = trigger.properties.get(key)
-
-                t_min = mathutils.Vector((float('inf'), float('inf'), float('inf')))
-                t_max = mathutils.Vector((-float('inf'), -float('inf'), -float('inf')))
-                for p in trigger.polyhedron.pointList:
-                    t_min.x = min(t_min.x, p.x)
-                    t_min.y = min(t_min.y, p.y)
-                    t_min.z = min(t_min.z, p.z)
+        if mover.interiorResIndex <= len(pathedInteriors) - 1:
+            pos = mover.offset
+            itr = pathedInteriors[mover.interiorResIndex]
+            itr: Object = itr.copy()
+            base = scene.collection.objects.link(itr)
+            itr.location = [-pos.x, -pos.y, -pos.z]
+            itr.dif_props.interior_type = "pathed_interior"
+            itr.dif_props.start_time = int(mover.properties.h.get("initialPosition", 0))
+            itr.dif_props.reverse = mover.properties.h.get("initialTargetPosition", 0) == "-2"
+            itr.dif_props.constant_speed = False
+    
+            waypoints: list[WayPoint] = mover.wayPoint
+    
+            markerpts = [
+                (waypt.position.x, waypt.position.y, waypt.position.z)
+                for waypt in waypoints
+            ]
+    
+            curve = bpy.data.curves.new("markers", type="CURVE")
+            curve.dimensions = "3D"
+            spline = curve.splines.new(type="POLY")
+            spline.points.add(len(markerpts) - 1)
 
-                    t_max.x = max(t_max.x, p.x)
-                    t_max.y = max(t_max.y, p.y)
-                    t_max.z = max(t_max.z, p.z)
+            for p, new_co in zip(spline.points, markerpts):
+                p.co = new_co + (1.0,)
+    
+            path = bpy.data.objects.new("path", curve)
+            scene.collection.objects.link(path)
+    
+            itr.dif_props.marker_path = curve
+    
+            total_time = 0
+            for pt in waypoints:
+                total_time += pt.msToNext
+            itr.dif_props.total_time = total_time
+    
+            if len(waypoints) > 0:
+                first_type = waypoints[0].smoothingType
+                if first_type == 0:
+                    itr.dif_props.marker_type = "linear"
+                elif first_type == 1:
+                    itr.dif_props.marker_type = "spline"
+                elif first_type == 2:
+                    itr.dif_props.marker_type = "accelerate"
+            else:
+                itr.dif_props.marker_type = "linear"
+                
+            if len(dif.triggers) > 0:    
+                for trigger_id in mover.triggerId:
+                    trigger = dif.triggers[trigger_id]
+                    tobj = bpy.data.objects.new(trigger.datablock, None)
+                    tobj.dif_props.interior_type = "path_trigger"
+                    tobj.dif_props.pathed_interior_target = itr
+                    tobj.dif_props.game_entity_datablock = trigger.datablock
+                    tobj.dif_props.target_marker = False
+                    for key in trigger.properties.h:
+                        prop = tobj.dif_props.game_entity_properties.add()
+                        prop.key = key
+                        prop.value = trigger.properties.get(key)
 
-                tobj.location = t_min
-                tobj.scale = mathutils.Vector((t_max.x - t_min.x, t_max.y - t_min.y, t_max.z - t_min.z))
-                tobj.location.y += tobj.scale.y
-                tobj.location += mathutils.Vector((trigger.offset.x, trigger.offset.y, trigger.offset.z))
-                scene.collection.objects.link(tobj)
+                    t_min = mathutils.Vector((float('inf'), float('inf'), float('inf')))
+                    t_max = mathutils.Vector((-float('inf'), -float('inf'), -float('inf')))
+                    for p in trigger.polyhedron.pointList:
+                        t_min.x = min(t_min.x, p.x)
+                        t_min.y = min(t_min.y, p.y)
+                        t_min.z = min(t_min.z, p.z)
+        
+                        t_max.x = max(t_max.x, p.x)
+                        t_max.y = max(t_max.y, p.y)
+                        t_max.z = max(t_max.z, p.z)
+        
+                    tobj.location = t_min
+                    tobj.scale = mathutils.Vector((t_max.x - t_min.x, t_max.y - t_min.y, t_max.z - t_min.z))
+                    tobj.location.y += tobj.scale.y
+                    tobj.location += mathutils.Vector((trigger.offset.x, trigger.offset.y, trigger.offset.z))
+                    scene.collection.objects.link(tobj)
 
     if dif.gameEntities != None:
         for ge in dif.gameEntities: