sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

use better Python 2.4 syntax sorting (in a try so py 2.3 still works)

Browse Source 
use new scene/object creation for making temp objects.
This commit is contained in:
Campbell Barton 2007-01-25 04:18:09 +00:00
parent 84b8e5b97b
commit 2a829b87e2
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
release/scripts/export_obj.py
View File

@ -264,19 +264,18 @@ EXPORT_GROUP_BY_OB=False, EXPORT_GROUP_BY_MAT=False):
# Add a dummy object to it.
oldmode = Mesh.Mode()
Mesh.Mode(Mesh.SelectModes['FACE'])
quadcount = 0
has_quads = False
for f in me.faces:
if len(f) == 4:
f.sel = True
quadcount +=1
has_quads = True
break
if quadcount:
tempob = Blender.Object.New('Mesh')
tempob.link(me)
scn.link(tempob)
if has_quads:
me.sel = True
tempob = scn.objects.new(me)
me.quadToTriangle(0) # more=0 shortest length
oldmode = Mesh.Mode(oldmode)
scn.unlink(tempob)
scn.objects.unlink(tempob)
Mesh.Mode(oldmode)
# Make our own list so it can be sorted to reduce context switching
@ -321,13 +320,15 @@ EXPORT_GROUP_BY_OB=False, EXPORT_GROUP_BY_MAT=False):
# Sort by Material, then images
# so we dont over context switch in the obj file.
if faceuv and EXPORT_UV:
faces.sort(lambda a,b: cmp((a.mat, a.image, a.smooth), (b.mat, b.image, b.smooth)))
try: faces.sort(key = lambda a: (a.mat, a.image, a.smooth))
except: faces.sort(lambda a,b: cmp((a.mat, a.image, a.smooth), (b.mat, b.image, b.smooth)))
elif len(materials) > 1:
faces.sort(lambda a,b: cmp((a.mat, a.smooth), (b.mat, b.smooth)))
try: faces.sort(key = lambda a: (a.mat, a.smooth))
except: faces.sort(lambda a,b: cmp((a.mat, a.smooth), (b.mat, b.smooth)))
else:
# no materials
faces.sort(lambda a,b: cmp(a.smooth, b.smooth))
try: faces.sort(key = lambda a: a.smooth)
except: faces.sort(lambda a,b: cmp(a.smooth, b.smooth))
# Set the default mat to no material and no image.
contextMat = (0, 0) # Can never be this, so we will label a new material teh first chance we get.
@ -505,6 +506,13 @@ EXPORT_GROUP_BY_OB=False, EXPORT_GROUP_BY_MAT=False):
def write_ui(filename):
if not filename.lower().endswith('.obj'):
filename += '.obj'
#if not BPyMessages.Warning_SaveOver(filename):
# return
EXPORT_APPLY_MODIFIERS = Draw.Create(1)
EXPORT_ROTX90 = Draw.Create(1)
EXPORT_TRI = Draw.Create(0)
@ -608,7 +616,7 @@ def write_ui(filename):
export_objects = scn.objects
full_path= ''.join(context_name)
print "ass", full_path
if BPyMessages.Warning_SaveOver(full_path):
# EXPORT THE FILE.
write(full_path, export_objects,\