From 089aef61debbece2baff6516e33fc7491629b1d0 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <bastien@blender.org>
Date: Mon, 7 Feb 2022 16:16:10 +0100
Subject: [PATCH] Fix missing removal of references to proxy (removed in
master).
---
io_scene_fbx/__init__.py | 4 ++--
io_scene_fbx/export_fbx_bin.py | 2 +-
io_scene_fbx/fbx_utils.py | 2 +-
object_edit_linked.py | 11 +----------
4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 3837be6a9..37bc94f56 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 6e7e960b3..842cbabc4 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 3a4214230..6dfb16e52 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...
diff --git a/object_edit_linked.py b/object_edit_linked.py
index 9299a5753..386e5c0c3 100644
--- a/object_edit_linked.py
+++ b/object_edit_linked.py
@@ -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
--
GitLab