X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;fp=blender%2Fio_mspgl%2Fexport_object.py;h=3ee06fc218c3fe1a618826eb22668b4687739e26;hb=db9fa2e2aba82aadc8da3fb8f4f4839419a06d90;hp=54bde96a5d29962f2ad9bac4279d0fe77d67a2ce;hpb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 54bde96a..3ee06fc2 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -2,12 +2,6 @@ import os
 import mathutils
 
 class ObjectExporter:
-	def __init__(self):
-		self.show_progress = True
-		self.export_all = False
-		self.collection = False
-		self.shared_resources = True
-
 	def compute_bounding_sphere(self, obj):
 		p1 = max(((v.co, v.co.length) for v in obj.data.vertices), key=lambda x:x[1])[0]
 		p2 = max(((v.co, (v.co-p1).length) for v in obj.data.vertices), key=lambda x:x[1])[0]
@@ -45,48 +39,6 @@ class ObjectExporter:
 		material_atlas_export = MaterialAtlasExporter()
 		return material_atlas_export
 
-	def export_to_file(self, context, out_fn):
-		if self.export_all:
-			objs = [o for o in context.selected_objects if o.type=="MESH"]
-		else:
-			objs = [context.active_object]
-
-		from .util import Progress
-		progress = Progress(self.show_progress and context)
-
-		path, base = os.path.split(out_fn)
-		base, ext = os.path.splitext(base)
-
-		resources = {}
-		for i, obj in enumerate(objs):
-			if self.export_all:
-				out_fn = os.path.join(path, obj.name+ext)
-
-			progress.push_task_slice(obj.name, i, len(objs))
-			self.export_object_resources(context, obj, resources, None, progress)
-
-			obj_res = self.export_object(context, obj, resources, progress)
-			refs = obj_res.collect_references()
-			if not self.shared_resources:
-				numbers = {}
-				for r in refs:
-					res_ext = os.path.splitext(r.name)[1]
-					n = numbers.get(res_ext, 0)
-					if n>0:
-						r.name = "{}_{}{}".format(base, n, res_ext)
-					else:
-						r.name = base+res_ext
-					numbers[res_ext] = n+1
-
-			if self.collection:
-				obj_res.write_collection(out_fn)
-			else:
-				for r in refs:
-					r.write_to_file(os.path.join(path, r.name))
-				obj_res.write_to_file(out_fn)
-
-			progress.pop_task()
-
 	def export_object_resources(self, context, obj, resources, material_atlases, progress):
 		if material_atlases is None:
 			material_atlases = {}
@@ -140,10 +92,9 @@ class ObjectExporter:
 
 			progress.pop_task()
 
-	def export_object(self, context, obj, resources, progress):
-		if resources is None:
-			resources = {}
-			self.export_object_resources(context, obj, resources, None, progress)
+	def export_object(self, obj, resources, progress):
+		if obj.type!='MESH':
+			raise ValueError("Object is not a mesh")
 
 		lods = self.collect_object_lods(obj)