Skip to content
Snippets Groups Projects
Commit 0015dd23 authored by Bastien Montagne's avatar Bastien Montagne
Browse files

Fix T45677: Explicitely ignore dupli instances of armatures, this is not supported currently.

Doubt to implement this any time soon, armatures and duplis are both complex area,
if you combine them together you get a Gordian knot (and have no right to cut it!).

Also, this commit fixes a stupid mistake - dupli objects types were not checked at all before...
parent 6a8229fc
Branches
Tags
No related merge requests found
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
bl_info = { bl_info = {
"name": "FBX format", "name": "FBX format",
"author": "Campbell Barton, Bastien Montagne, Jens Restemeier", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier",
"version": (3, 5, 2), "version": (3, 5, 3),
"blender": (2, 74, 0), "blender": (2, 74, 0),
"location": "File > Import-Export", "location": "File > Import-Export",
"description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", "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): ...@@ -294,7 +294,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper, IOFBXOrientationHelper):
items=(('EMPTY', "Empty", ""), items=(('EMPTY', "Empty", ""),
('CAMERA', "Camera", ""), ('CAMERA', "Camera", ""),
('LAMP', "Lamp", ""), ('LAMP', "Lamp", ""),
('ARMATURE', "Armature", ""), ('ARMATURE', "Armature", "WARNING: not supported in dupli/group instances"),
('MESH', "Mesh", ""), ('MESH', "Mesh", ""),
('OTHER', "Other", "Other geometry types, like curve, metaball, etc. (converted to meshes)"), ('OTHER', "Other", "Other geometry types, like curve, metaball, etc. (converted to meshes)"),
), ),
......
...@@ -2097,6 +2097,7 @@ def fbx_data_from_scene(scene, settings): ...@@ -2097,6 +2097,7 @@ def fbx_data_from_scene(scene, settings):
Do some pre-processing over scene's data... Do some pre-processing over scene's data...
""" """
objtypes = settings.object_types objtypes = settings.object_types
dp_objtypes = objtypes - {'ARMATURE'} # Armatures are not supported as dupli instances currently...
perfmon = PerfMon() perfmon = PerfMon()
perfmon.level_up() perfmon.level_up()
...@@ -2115,6 +2116,8 @@ def fbx_data_from_scene(scene, settings): ...@@ -2115,6 +2116,8 @@ def fbx_data_from_scene(scene, settings):
# Duplis... # Duplis...
ob_obj.dupli_list_create(scene, 'RENDER') ob_obj.dupli_list_create(scene, 'RENDER')
for dp_obj in ob_obj.dupli_list: for dp_obj in ob_obj.dupli_list:
if dp_obj.type not in dp_objtypes:
continue
objects[dp_obj] = None objects[dp_obj] = None
ob_obj.dupli_list_clear() ob_obj.dupli_list_clear()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment