X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=905bfe73b6f52fbeda10ab1c172b652117a68bbf;hb=944deb38084e5e5bc82182faab2db2be156b971c;hp=e1efbc21d0feeaafc2e5a04e6263e29391169122;hpb=09c8337778f6d2e595016d02023297d958cf6316;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index e1efbc21..905bfe73 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -7,7 +7,7 @@ bl_info = {
 
 if "bpy" in locals():
 	import imp
-	for sub in "armature", "export_armature", "export_mesh", "export_object", "export_scene", "mesh", "outfile", "properties", "util":
+	for sub in "armature", "datafile", "export_armature", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "material", "mesh", "properties", "util":
 		if sub in locals():
 			imp.reload(locals()[sub])
 
@@ -20,7 +20,7 @@ class ExportMspGLBase(ExportHelper):
 	def execute(self, context):
 		exporter = self.create_exporter()
 		self.prepare_exporter(exporter)
-		exporter.export(context, self.filepath)
+		exporter.export_to_file(context, self.filepath)
 		return {"FINISHED"}
 
 	def create_exporter(self):
@@ -58,17 +58,11 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 
 	filename_ext = ".object"
 
-	textures = bpy.props.EnumProperty(name="Textures", description="Export textures", default="REF",
-		items=(("NONE", "None", "Ignore textures"),
-			("REF", "Referenced", "Reference external data"),
-			("INLINE", "Inline", "Embed textures in the object")))
-
-	separate_mesh = bpy.props.BoolProperty(name="Separate mesh", description="Write mesh data into a separate file", default=False)
-	shared_mesh = bpy.props.BoolProperty(name="Shared mesh", description="Use mesh name for mesh file to enable sharing", default=True)
-	separate_tech = bpy.props.BoolProperty(name="Separate technique", description="Write technique data into a separate file", default=False)
-	shared_tech = bpy.props.BoolProperty(name="Shared technique", description="Use material name for technique file to enable sharing", default=True)
+	single_file = bpy.props.BoolProperty(name="Single file", description="Write all data into a single file", default=True)
+	shared_resources = bpy.props.BoolProperty(name="Shared resources", description="Use global names for resource files to enable sharing", default=True)
 
 	export_lods = bpy.props.BoolProperty(name="Export LoDs", description="Export all levels of detail", default=True)
+	use_textures = bpy.props.BoolProperty(name="Use textures", description="Use textures in the exported object", default=True)
 
 	def create_exporter(self):
 		from .export_object import ObjectExporter
@@ -77,21 +71,14 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 	def draw(self, context):
 		super().draw(context)
 
-		col = self.general_col
-		col.prop(self, "export_lods")
-		col.prop(self, "textures")
-		col.separator()
-
-		self.layout.separator()
+		self.general_col.prop(self, "export_lods")
+		self.general_col.prop(self, "use_textures")
 
 		col = self.layout.column()
 		col.label("Files")
-		col.prop(self, "separate_mesh")
-		if self.separate_mesh:
-			col.prop(self, "shared_mesh")
-		col.prop(self, "separate_tech")
-		if self.separate_tech:
-			col.prop(self, "shared_tech")
+		col.prop(self, "single_file")
+		if not self.single_file:
+			col.prop(self, "shared_resources")
 
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_armature"