Fix missing removal of references to proxy (removed in master).

This commit is contained in:
Bastien Montagne 2022-02-07 16:16:10 +01:00
parent f1993babd0
commit 089aef61de
4 changed files with 5 additions and 14 deletions

View File

@ -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": "",

View File

@ -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

View File

@ -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...

View File

@ -81,8 +81,6 @@ class OBJECT_OT_EditLinked(bpy.types.Operator):
return settings["original_file"] == "" and context.active_object is not None and (
(context.active_object.instance_collection and
context.active_object.instance_collection.library is not None) or
(context.active_object.proxy and
context.active_object.proxy.library is not None) or
context.active_object.library is not None or
(context.active_object.override_library and
context.active_object.override_library.reference.library is not None))
@ -96,10 +94,6 @@ class OBJECT_OT_EditLinked(bpy.types.Operator):
elif target.library:
targetpath = target.library.filepath
settings["linked_objects"].append(target.name)
elif target.proxy:
target = target.proxy
targetpath = target.library.filepath
settings["linked_objects"].append(target.name)
elif target.override_library:
target = target.override_library.reference
targetpath = target.library.filepath
@ -259,10 +253,7 @@ class VIEW3D_PT_PanelLinkedEdit(bpy.types.Panel):
target = None
if context.active_object.proxy:
target = context.active_object.proxy
else:
target = context.active_object.instance_collection
target = context.active_object.instance_collection
if settings["original_file"] == "" and (
(target and