Merge pull request #31 from Devostated/main

v1.12.6 (2021-08-31T17:17Z)

Author: dtugend

advancedfx/__init__.py

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

advancedfx/import_agr.py

@@ -53,7 +53,7 @@ def execute(self, context):
 		self.readQC(self.filepath, False, False, False, 'XYZ', outer_qc = True)
 		GAgrImporter.smd = self.smd
 		return {'FINISHED'}
-		
+	
 	def readPolys(self):
 		if GAgrImporter.onlyBones:
 			return
@@ -63,14 +63,14 @@ def readShapes(self):
 		if GAgrImporter.onlyBones:
 			return
 		super(SmdImporterEx, self).readShapes()
-        
+	
 	def readSMD(self, filepath, upAxis, rotMode, newscene = False, smd_type = None, target_layer = 0):
-		if SmdImporterEx.bSkip and (smd_type == vs_utils.PHYS or splitext(basename(filepath))[0].rstrip("123456789").endswith("_lod")):
+		s = splitext(basename(filepath))[0].rstrip("123456789")
+		if SmdImporterEx.bSkip and (smd_type == vs_utils.PHYS or s.endswith("_lod") or any(filepath.endswith(u) for u in ("skeleto.smd", "skel.smd"))):
 			return 0
 		else:
 			return super().readSMD(filepath, upAxis, rotMode, newscene, smd_type, target_layer) # call parent method
 
-
 def ReadString(file):
 	buf = bytearray()
 	while True:
@@ -330,11 +330,17 @@ class AgrImporter(bpy.types.Operator, vs_utils.Logger):
 	)
 
 	bSkip: bpy.props.BoolProperty(
-		name="Skip Physic and LOD Meshes",
+		name="Skip Physic, LOD and Shared_Player_Skeleton meshes",
 		description="Skips the import of physic (collision) meshes if the .qc contains them.",
 		default = True
 	)
-
+	
+	aSkip: bpy.props.BoolProperty(
+		name="Skip Stattrack and Stickers",
+		description="Skips the import of Stattrack and Sticker meshes if the .qc contains them.",
+		default = True
+	)
+	
 	onlyBones: bpy.props.BoolProperty(
 		name="Bones (skeleton) only",
 		description="Import only bones (skeletons) (faster).",
@@ -510,8 +516,10 @@ def copyObj(src,parent=None):
 			GAgrImporter.smd = None
 			GAgrImporter.onlyBones = self.onlyBones
 			modelData = None
-			
+
 			try:
+				if self.aSkip and any(filePath.endswith(a) for a in ("stattrack.qc", "decal_a.qc", "decal_b.qc", "decal_c.qc", "decal_d.qc", "decal_e")):
+					return
 				bpy.ops.advancedfx.smd_importer_ex(filepath=filePath, doAnim=False)
 				modelData = ModelData(GAgrImporter.smd)
 			except Exception as e:

advancedfx/readme.txt

@@ -50,6 +50,10 @@ For more informations visit it's Advancedfx Wiki page ( https://github.com/advan
 
 Changelog:
 
+1.12.6 (2021-08-31T17:17Z):
+- added skip import option for Stattrack and Stickers
+- added skip import for shared_player_skeleton to Skip Physic and LOD Meshes
+
 1.12.5 (2020-04-28T21:03Z):
 - added support for Blender 3.0 Alpha
 - fixed changing Root Bone Name