X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=a1869e3ecd74ee7ca2efb5e8c79477483c0c44b4;hb=abe48249502a50f798d647cfa05a655379ea656b;hp=43a3fac8f691270bae32a61bd9447bd2059ad5ef;hpb=d3813a0ab6ee2f8b9af775c28b51b512abe6cd09;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index 43a3fac8..a1869e3e 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -1,5 +1,6 @@
 bl_info = {
 	"name": "Msp GL datafiles",
+	"blender": (2, 80, 0),
 	"author": "Mikko Rasa",
 	"location": "File > Export",
 	"description": "Export Msp GL data",
@@ -17,6 +18,14 @@ from bpy_extras.io_utils import ExportHelper
 class ExportMspGLBase(ExportHelper):
 	show_progress = bpy.props.BoolProperty(name="Show progress", description="Display progress indicator while exporting", default=True)
 
+	def set_extension(self, ext):
+		ext_changed = (ext!=self.filename_ext)
+		if ext_changed:
+			if self.filepath.endswith(self.filename_ext):
+				self.filepath = self.filepath[:-len(self.filename_ext)]
+			self.filename_ext = ext
+		return ext_changed
+
 	def execute(self, context):
 		exporter = self.create_exporter()
 		self.prepare_exporter(exporter)
@@ -38,7 +47,7 @@ class ExportMspGLMeshBase(ExportMspGLBase):
 		self.general_col = self.layout.column()
 
 		col = self.layout.column()
-		col.label("Triangle strips")
+		col.label(text="Triangle strips")
 		col.prop(self, "use_strips")
 		col.prop(self, "use_degen_tris")
 
@@ -75,7 +84,7 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 		self.general_col.prop(self, "use_textures")
 
 		col = self.layout.column()
-		col.label("Files")
+		col.label(text="Files")
 		col.prop(self, "single_file")
 		if not self.single_file:
 			col.prop(self, "shared_resources")
@@ -101,17 +110,8 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
 	looping_threshold = bpy.props.FloatProperty(name="Looping threshold", description="Tolerance for curve beginning and end values for looping", min=0.0, soft_max=1.0, precision=4, default=0.001)
 
 	def check(self, context):
-		result = False
-
-		ext = ".mdc" if self.export_all and self.collection else ".anim"
-		ext_changed = (ext!=self.filename_ext)
-		if ext_changed:
-			if self.filepath.endswith(self.filename_ext):
-				self.filepath = self.filepath[:-len(self.filename_ext)]
-			self.filename_ext = ext
-
+		ext_changed = self.set_extension(".mdc" if self.export_all and self.collection else ".anim")
 		super_result = super().check(context)
-
 		return ext_changed or super_result
 
 	def create_exporter(self):
@@ -132,8 +132,9 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 	filename_ext = ".scene"
 
 	selected_only = bpy.props.BoolProperty(name="Selected objects only", description="Only export the selected objects")
-	active_layers = bpy.props.BoolProperty(name="Active layers only", description="Only export objects on the active layers", default=True)
+	visible_collections = bpy.props.BoolProperty(name="Visible collections only", description="Only export objects in visible collections", default=True)
 	resource_collection = bpy.props.BoolProperty(name="Resource collection", description="Put resources to a single collection file", default=True)
+	skip_existing = bpy.props.BoolProperty(name="Skip existing files", description="Skip resources that already exist as files", default=True)
 
 	def create_exporter(self):
 		from .export_scene import SceneExporter
@@ -142,8 +143,10 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 	def draw(self, context):
 		col = self.layout.column()
 		col.prop(self, "selected_only")
-		col.prop(self, "active_layers")
+		col.prop(self, "visible_collections")
 		col.prop(self, "resource_collection")
+		if self.resource_collection:
+			col.prop(self, "skip_existing")
 
 class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_camera"
@@ -163,20 +166,22 @@ def menu_func_export(self, context):
 	self.layout.operator(ExportMspGLScene.bl_idname, text="Msp GL scene")
 	self.layout.operator(ExportMspGLCamera.bl_idname, text="Msp GL camera")
 
-from .properties import MspGLMeshProperties, MspGLObjectProperties
+classes = [ExportMspGLMesh, ExportMspGLObject, ExportMspGLArmature, ExportMspGLAnimation, ExportMspGLScene, ExportMspGLCamera]
 
 def register():
-	bpy.utils.register_module(__name__)
+	for c in classes:
+		bpy.utils.register_class(c)
 
-	bpy.types.INFO_MT_file_export.append(menu_func_export)
+	bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
 	from .properties import register_properties
 	register_properties()
 
 def unregister():
-	bpy.utils.unregister_module(__name__)
+	for c in classes:
+		bpy.utils.unregister_class(c)
 
-	bpy.types.INFO_MT_file_export.remove(menu_func_export)
+	bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
-if __name__=="__main__":
-	register()
+	from .properties import unregister_properties
+	unregister_properties()