diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-02-07 18:16:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-02-07 18:16:10 +0300 |
| commit | 089aef61debbece2baff6516e33fc7491629b1d0 (patch) | |
| tree | cc71841dbcda7121cf4f3a3055900b93d9dda730 /io_scene_fbx | |
| parent | f1993babd0aedc358eb421b818f00c1bd98579dd (diff) | |
Fix missing removal of references to proxy (removed in master).
Diffstat (limited to 'io_scene_fbx')
| -rw-r--r-- | io_scene_fbx/__init__.py | 4 | ||||
| -rw-r--r-- | io_scene_fbx/export_fbx_bin.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/fbx_utils.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 3837be6a..37bc94f5 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,8 +21,8 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (4, 29, 0), - "blender": (2, 90, 0), + "version": (4, 30, 0), + "blender": (3, 2, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", "warning": "", diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py index 6e7e960b..842cbabc 100644 --- a/io_scene_fbx/export_fbx_bin.py +++ b/io_scene_fbx/export_fbx_bin.py @@ -1874,7 +1874,7 @@ def fbx_skeleton_from_armature(scene, settings, arm_obj, objects, data_meshes, if mod.type not in {'ARMATURE'} or not mod.object: continue # We only support vertex groups binding method, not bone envelopes one! - if mod.object in {arm_obj.bdata, arm_obj.bdata.proxy} and mod.use_vertex_groups: + if mod.object == arm_obj.bdata and mod.use_vertex_groups: found = True break diff --git a/io_scene_fbx/fbx_utils.py b/io_scene_fbx/fbx_utils.py index 3a421423..6dfb16e5 100644 --- a/io_scene_fbx/fbx_utils.py +++ b/io_scene_fbx/fbx_utils.py @@ -1197,7 +1197,7 @@ class ObjectWrapper(metaclass=MetaObjectWrapper): if self.parent == arm_obj and self.bdata.parent_type == 'ARMATURE': return True for mod in self.bdata.modifiers: - if mod.type == 'ARMATURE' and mod.object in {arm_obj.bdata, arm_obj.bdata.proxy}: + if mod.type == 'ARMATURE' and mod.object == arm_obj.bdata: return True # #### Duplis... |