Merge pull request #99 from soupday/Dev

2.3.2

Author: soupday

btp/cc.py

@@ -1947,10 +1947,12 @@ def get_all_camera_light_data(no_animation=False):
             }
             for light in lights:
                 light_data = get_light_data(light)
-                frame_lights.append(light_data)
+                if light_data:
+                    frame_lights.append(light_data)
             for camera in cameras:
                 camera_data = get_camera_data(camera)
-                frame_cameras.append(camera_data)
+                if camera_data:
+                    frame_cameras.append(camera_data)
             all_data.append(frame_data)
         else:
             time, frame = begin_timeline_scan()
@@ -2103,13 +2105,14 @@ def get_light_data(light: RILight):
     dir_light: RIDirectionalLight = None
     point_light: RIPointLight = None
     light_type = "NONE"
-    if type(light) is RISpotLight:
+    T = type(light)
+    if T is RISpotLight:
         spot_light = light
         light_type = "SPOT"
-    elif type(light) is RIPointLight:
+    elif T is RIPointLight:
         point_light = light
         light_type = "POINT"
-    elif type(light) is RIDirectionalLight:
+    elif T is RIDirectionalLight:
         dir_light = light
         light_type = "DIR"
     else:
@@ -2200,6 +2203,9 @@ def get_light_data(light: RILight):
 
 
 def get_camera_data(camera: RICamera):
+        T = type(camera)
+        if T is not RICamera:
+            return None
         link_id = get_link_id(camera, add_if_missing=True)
         name = camera.GetName()
         time = RGlobal.GetTime()

btp/exporter.py

@@ -964,7 +964,9 @@ def export_extra_data(self):
         root_json = json_data.get_root_json()
 
         if self.light:
-            root_json["Object"][self.character_id]["Light"] = cc.get_light_data(self.light)
+            light_data = cc.get_light_data(self.light)
+            if light_data:
+                root_json["Object"][self.character_id]["Light"] = light_data
 
         if json_data is None:
             utils.log_error("No valid json data could be found for the export ...")

btp/link.py

@@ -2897,7 +2897,8 @@ def encode_pose_frame_data(self, actors: list):
 
                 # pack animateable light data
                 light_data = cc.get_light_data(actor.object)
-                data += struct.pack("!?fffffffff",
+                if light_data:
+                    data += struct.pack("!?fffffffff",
                                     light_data["active"],
                                     light_data["color"][0],
                                     light_data["color"][1],
@@ -2913,7 +2914,8 @@ def encode_pose_frame_data(self, actors: list):
 
                 # pack animateable camera data
                 camera_data = cc.get_camera_data(actor.object)
-                data += struct.pack("!f?fffffff",
+                if camera_data:
+                    data += struct.pack("!f?fffffff",
                                      camera_data["focal_length"],
                                      camera_data["dof_enable"],
                                      camera_data["dof_focus"], # Focus Distance
@@ -2983,7 +2985,8 @@ def get_lights_data(self, actors):
         for actor in actors:
             if actor.is_light():
                 light_data = cc.get_light_data(actor.get_light())
-                data["lights"].append(light_data)
+                if light_data:
+                    data["lights"].append(light_data)
 
         return data