simple change, made

Changed...
  me = NMesh.GetRaw(ob.data.name)
To
  me = NMesh.GetRaw(ob.getData(name_only=1))

The line above converts the entire mesh to a python thick wrapper just to get its name, then only to that that same mesh again??
A lot of older scripts did this but theres no reason to do it.

in most (all?) cases..
  me = ob.data - should be ok, but theres a subtle difference and I dont want to break anything.

xfig_export, xsi_export and videoscape_export need error checking too.
This commit is contained in:
Campbell Barton 2006-12-12 10:38:43 +00:00
parent 848d3ae617
commit 09e4fa8f6a
9 changed files with 19 additions and 20 deletions

@ -119,8 +119,7 @@ def versioned_name(objname):
existing_names = []
for object in Blender.Object.Get():
existing_names.append(object.name)
data = object.data
if data: existing_names.append(data.name)
existing_names.append(object.getData(name_only=1))
if objname in existing_names: # don't over-write other names
try:
name, ext = objname.split('.')

@ -239,8 +239,8 @@ def paint():
if Me[0].getType()=='Mesh':
vindex=[]
ORIName=Me[0].getData().name
me=NMesh.GetRaw(Me[0].getData().name)
ORIName=Me[0].getData(name_only=1)
me=NMesh.GetRaw(Me[0].getData(name_only=1))
try:
for m in me.verts:
@ -285,7 +285,7 @@ def NEWMEcreation(obj):
ozero=obj
nomdelobjet=ozero.getName()
Mesh=Blender.NMesh.GetRawFromObject(nomdelobjet)
name=obj.getData().name
name=obj.getData(name_only=1)
n=0; name2=name[:];ok=0
while ok==0:
@ -305,7 +305,7 @@ def DOCMat_list(TMATList):
Me=Object.GetSelected()
if Me!=[]:
if Me[0].getType()=='Mesh':
me=NMesh.GetRaw(Me[0].getData().name)
me=NMesh.GetRaw(Me[0].getData(name_only=1))
if len(me.materials)!=0:
n=0
for mat in me.materials:

@ -145,7 +145,7 @@ for obj in objs:
# update vertices
mirror_mesh = mirror_obj.getData()
for i in range(len(mesh.verts)):
for i in xrange(len(mesh.verts)):
org = mesh.verts[i]
mir = mirror_mesh.verts[i]
mir.co[0], mir.co[1], mir.co[2] = org.co[0], org.co[1], org.co[2]
@ -156,7 +156,7 @@ for obj in objs:
# create mirror object
mirror_mesh = Blender.NMesh.GetRaw(obj.getData().name)
mirror_mesh = obj.data
for face in mirror_mesh.faces:
flipFace(face.v)
for vert in mirror_mesh.verts:

@ -85,9 +85,9 @@ def write(filename):
objects = Blender.Object.GetSelected()
objname = objects[0].name
meshname = objects[0].data.name
meshname = objects[0].getData(name_only=1)
mesh = Blender.NMesh.GetRaw(meshname)
obj = Blender.Object.Get(objname)
obj = objects[0]
numedges = len(mesh.verts)+len(mesh.faces)-2
maxedges = (2**16)-1 # Blender & Wings can read more edges

@ -93,9 +93,9 @@ def write(filename):
G,P,V,U,M = 1000,2000,3000,4000,5000
for object in objects:
objname = object.name
meshname = object.data.name
meshname = object.getData(name_only=1)
mesh = Blender.NMesh.GetRaw(meshname)
obj = Blender.Object.Get(objname)
obj = object
if not mesh: continue
grou = generate_grou('Group ' + `objects.index(object)+1`)

@ -409,7 +409,7 @@ def save(x0,y0,dx,dy):
Blender.Redraw()
def DOCMat_list(TMATList,ME):
me=Blender.NMesh.GetRaw(ME.getData().name)
me=Blender.NMesh.GetRaw(ME.getData(name_only=1))
if len(me.materials)!=0:
n=0
for mat in me.materials:

@ -83,9 +83,9 @@ def write(filename):
objects = Blender.Object.GetSelected()
objname = objects[0].name
meshname = objects[0].data.name
meshname = objects[0].getData(name_only=1)
mesh = Blender.NMesh.GetRaw(meshname)
obj = Blender.Object.Get(objname)
obj = objects[0]
if not meshtools.has_vertex_colors(mesh):
message = "Please assign vertex colors before exporting.\n"

@ -71,7 +71,7 @@ def getmaxmin():
"""Getting the extremes of the mesh to be exported"""
objects = Blender.Object.GetSelected()
objname = objects[0].name
meshname = objects[0].data.name
meshname = objects[0].getData(name_only=1)
mesh = Blender.NMesh.GetRaw(meshname)
obj = Blender.Object.Get(objname)
#initializing max-min find.
@ -226,7 +226,7 @@ def figdata(expview):
"""Prints all the xfig data (no header)"""
objects = Blender.Object.GetSelected()
objname = objects[0].name
meshname = objects[0].data.name
meshname = objects[0].getData(name_only=1)
mesh = Blender.NMesh.GetRaw(meshname)
obj = Blender.Object.Get(objname)
facenumber = len(mesh.faces)

@ -641,7 +641,7 @@ def do_mesh_shape(obj):
global UVC, UVI, VCC, VCI, FD, NORMALS
# Grab the mesh itself
mesh = Blender.NMesh.GetRaw(obj.data.name)
mesh = obj.data
# get the world matrix
matrix = obj.getMatrix('worldspace')
@ -1008,7 +1008,7 @@ def do_model(obj):
#
def validMesh (obj):
mesh = Blender.NMesh.GetRaw(obj.data.name)
mesh = obj.data
for f in mesh.faces:
if len(f.v) < 3:
print "MESH HAS FACES WITH < 3 VERTICES"
@ -1071,7 +1071,7 @@ def do_light(obj):
aLampType = 1
lmpName=Lamp.Get(obj.data.getName())
lmpName=Lamp.Get(obj.getData(name_only=1))
lmpType=lmpName.getType()
if lmpType == Lamp.Types.Lamp: