[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4683] trunk/py/scripts/addons/ io_scene_fbx/import_fbx.py: fix for loading some FBX files

[Campbell Barton]

Revision: 4683
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4683
Author:   campbellbarton
Date:     2013-08-19 14:41:05 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
fix for loading some FBX files

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_fbx/import_fbx.py

Modified: trunk/py/scripts/addons/io_scene_fbx/import_fbx.py
===================================================================
--- trunk/py/scripts/addons/io_scene_fbx/import_fbx.py	2013-08-19 14:41:02 UTC (rev 4682)
+++ trunk/py/scripts/addons/io_scene_fbx/import_fbx.py	2013-08-19 14:41:05 UTC (rev 4683)
@@ -116,7 +116,7 @@
             # 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 @@
         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')