diff --git a/release/scripts/bpymodules/meshtools.py b/release/scripts/bpymodules/meshtools.py index c523334eb7a..274a12ea6da 100644 --- a/release/scripts/bpymodules/meshtools.py +++ b/release/scripts/bpymodules/meshtools.py @@ -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('.') diff --git a/release/scripts/disp_paint.py b/release/scripts/disp_paint.py index da255a446c0..e55cd92a5d8 100644 --- a/release/scripts/disp_paint.py +++ b/release/scripts/disp_paint.py @@ -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: diff --git a/release/scripts/envelope_symmetry.py b/release/scripts/envelope_symmetry.py index 7031c1b72a9..f4674797dd6 100644 --- a/release/scripts/envelope_symmetry.py +++ b/release/scripts/envelope_symmetry.py @@ -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: diff --git a/release/scripts/nendo_export.py b/release/scripts/nendo_export.py index ff9600769d0..139d61027ab 100644 --- a/release/scripts/nendo_export.py +++ b/release/scripts/nendo_export.py @@ -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 diff --git a/release/scripts/truespace_export.py b/release/scripts/truespace_export.py index a9f1688ae46..646c92f3a93 100644 --- a/release/scripts/truespace_export.py +++ b/release/scripts/truespace_export.py @@ -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`) diff --git a/release/scripts/uvpaint.py b/release/scripts/uvpaint.py index 357c2d94aed..5ecacf26d57 100644 --- a/release/scripts/uvpaint.py +++ b/release/scripts/uvpaint.py @@ -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: diff --git a/release/scripts/videoscape_export.py b/release/scripts/videoscape_export.py index 49160e8b48d..6aef90eb2d6 100644 --- a/release/scripts/videoscape_export.py +++ b/release/scripts/videoscape_export.py @@ -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" diff --git a/release/scripts/xfig_export.py b/release/scripts/xfig_export.py index 94284120f34..ca6f571e244 100644 --- a/release/scripts/xfig_export.py +++ b/release/scripts/xfig_export.py @@ -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) diff --git a/release/scripts/xsi_export.py b/release/scripts/xsi_export.py index c180dac6cdf..0be1857027c 100644 --- a/release/scripts/xsi_export.py +++ b/release/scripts/xsi_export.py @@ -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: