From 7040b8cdc579c43b078e182091d66a2f3f6331c0 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 19 Aug 2013 14:41:05 +0000
Subject: [PATCH] fix for loading some FBX files
---
io_scene_fbx/import_fbx.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index ed2a8c8bd..fee279868 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -116,7 +116,7 @@ def elem_props_get_color_rgb(elem, elem_prop_id, default=None):
# FBX version 7300
assert(elem_prop.props[1] == b'Color')
assert(elem_prop.props[2] == b'')
- assert(elem_prop.props[3] == b'A')
+ assert(elem_prop.props[3] in {b'A', b'A+'})
else:
assert(elem_prop.props[1] == b'ColorRGB')
assert(elem_prop.props[2] == b'Color')
@@ -582,7 +582,7 @@ def blen_read_light(fbx_obj, global_scale):
lamp.spot_size = math.radians(elem_props_get_number(fbx_props, b'Cone angle', 45.0))
# TODO, cycles
- lamp.color = elem_props_get_number(fbx_props, b'Color', (1.0, 1.0, 1.0))
+ lamp.color = elem_props_get_color_rgb(fbx_props, b'Color', (1.0, 1.0, 1.0))
lamp.energy = elem_props_get_number(fbx_props, b'Intensity', 100.0) / 100.0
lamp.distance = elem_props_get_number(fbx_props, b'DecayStart', 25.0) * global_scale
lamp.shadow_method = ('RAY_SHADOW' if elem_props_get_bool(fbx_props, b'CastShadow', True) else 'NOSHADOW')
--
GitLab