diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 243c9a2e37c51e54627103cb8d879957da6eaea1..5e3f93a5ce9a1a48c9245a9386ff70500c649f8f 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 5, 2), + "version": (3, 5, 3), "blender": (2, 74, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", @@ -294,7 +294,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper, IOFBXOrientationHelper): items=(('EMPTY', "Empty", ""), ('CAMERA', "Camera", ""), ('LAMP', "Lamp", ""), - ('ARMATURE', "Armature", ""), + ('ARMATURE', "Armature", "WARNING: not supported in dupli/group instances"), ('MESH', "Mesh", ""), ('OTHER', "Other", "Other geometry types, like curve, metaball, etc. (converted to meshes)"), ), diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py index 46415b2f3ec79eb5680288f680720a9eb82e6be6..58cfea1b3cdd22af42e20c0be5e7c7feb63c93f8 100644 --- a/io_scene_fbx/export_fbx_bin.py +++ b/io_scene_fbx/export_fbx_bin.py @@ -2097,6 +2097,7 @@ def fbx_data_from_scene(scene, settings): Do some pre-processing over scene's data... """ objtypes = settings.object_types + dp_objtypes = objtypes - {'ARMATURE'} # Armatures are not supported as dupli instances currently... perfmon = PerfMon() perfmon.level_up() @@ -2115,6 +2116,8 @@ def fbx_data_from_scene(scene, settings): # Duplis... ob_obj.dupli_list_create(scene, 'RENDER') for dp_obj in ob_obj.dupli_list: + if dp_obj.type not in dp_objtypes: + continue objects[dp_obj] = None ob_obj.dupli_list_clear()