Merge pull request #38 from Devostated/main

1.14.2 (2022-06-12T08:46Z)
- fixed AGR Batch Export issue, which caused an error on export if an armature was deleted of the viewport

Author: Devostated

advancedfx/__init__.py

@@ -3,7 +3,7 @@
 bl_info = {
 	"name": "advancedfx Blender Scripts",
 	"author": "advancedfx.org",
-	"version": (1, 14, 0),
+	"version": (1, 14, 2),
 	"blender": (2, 80, 0),
 	"location": "File > Import/Export",
 	"description": "For inter-operation with HLAE.",

advancedfx/export_agr2fbx.py

@@ -46,43 +46,46 @@ def execute(self, context):
 			self.filepath = self.filepath.rsplit(sep="\\", maxsplit=1)[0] + "\\"
 
 		# export model
+		bpy.ops.object.select_all(action='DESELECT')
 		for CurrentModel in bpy.data.objects:
 			if CurrentModel.name.find("afx.") != -1:
-				# select root
-				CurrentModel.select_set(1)
-				# select childrens
-				for CurrentChildren in CurrentModel.children:
-					CurrentChildren.select_set(1)
-				# rename top to root
-				CurrentObjectName = CurrentModel.name
-				CurrentModel.name = self.root_name
-				# export single objects as fbx
-				fullfiles = self.filepath + "/" + CurrentObjectName + ".fbx"
-				if self.skip_meshes:
-					bpy.ops.export_scene.fbx(
-						filepath = fullfiles, 
-						object_types={'ARMATURE'}, 
-						use_selection = True, 
-						global_scale =  self.global_scale, 
-						bake_anim_use_nla_strips = False, 
-						bake_anim_use_all_actions = False, 
-						bake_anim_simplify_factor = 0,
-						add_leaf_bones=False)
-				else:
-					bpy.ops.export_scene.fbx(
-						filepath = fullfiles,
-						object_types={'ARMATURE', 'MESH'},
-						use_selection = True,
-						global_scale =  self.global_scale, 
-						bake_anim_use_nla_strips = False, 
-						bake_anim_use_all_actions = False, 
-						bake_anim_simplify_factor = 0,
-						add_leaf_bones=False)
-				# undo all changes
-				CurrentModel.name = CurrentObjectName
-				CurrentModel.select_set(0)
-				for CurrentChildren in CurrentModel.children:
-					CurrentChildren.select_set(0)
+				for o in context.scene.objects:
+					if o.name == CurrentModel.name:
+         				# select root
+						CurrentModel.select_set(1)
+						# select childrens
+						for CurrentChildren in CurrentModel.children:
+							CurrentChildren.select_set(1)
+						# rename top to root
+						CurrentObjectName = CurrentModel.name
+						CurrentModel.name = self.root_name
+						# export single objects as fbx
+						fullfiles = self.filepath + "/" + CurrentObjectName + ".fbx"
+						if self.skip_meshes:
+							bpy.ops.export_scene.fbx(
+								filepath = fullfiles, 
+								object_types={'ARMATURE'}, 
+								use_selection = True, 
+								global_scale =  self.global_scale, 
+								bake_anim_use_nla_strips = False, 
+								bake_anim_use_all_actions = False, 
+								bake_anim_simplify_factor = 0,
+								add_leaf_bones=False)
+						else:
+							bpy.ops.export_scene.fbx(
+								filepath = fullfiles,
+								object_types={'ARMATURE', 'MESH'},
+								use_selection = True,
+								global_scale =  self.global_scale, 
+								bake_anim_use_nla_strips = False, 
+								bake_anim_use_all_actions = False, 
+								bake_anim_simplify_factor = 0,
+								add_leaf_bones=False)
+						# undo all changes
+						CurrentModel.name = CurrentObjectName
+						CurrentModel.select_set(0)
+						for CurrentChildren in CurrentModel.children:
+							CurrentChildren.select_set(0)
 
 		# export camera
 		for CameraData in bpy.data.objects:

advancedfx/readme.txt

@@ -50,6 +50,9 @@ For more informations visit it's Advancedfx Wiki page ( https://github.com/advan
 
 Changelog:
 
+1.14.2 (2022-06-12T08:46Z):
+- fixed AGR Batch Export issue, which caused an error on export if an armature was deleted of the viewport
+
 1.14.1 (2022-03-11T22:28Z):
 - Added support for AGR version 6, still supports version 5.