diff options
Diffstat (limited to 'release/scripts/io')
-rw-r--r-- | release/scripts/io/engine_render_pov.py | 2 | ||||
-rw-r--r-- | release/scripts/io/export_3ds.py | 8 | ||||
-rw-r--r-- | release/scripts/io/export_fbx.py | 4 | ||||
-rw-r--r-- | release/scripts/io/export_mdd.py | 4 | ||||
-rw-r--r-- | release/scripts/io/export_obj.py | 8 | ||||
-rw-r--r-- | release/scripts/io/export_ply.py | 19 | ||||
-rw-r--r-- | release/scripts/io/export_x3d.py | 4 | ||||
-rw-r--r-- | release/scripts/io/import_anim_bvh.py | 2 | ||||
-rw-r--r-- | release/scripts/io/import_scene_3ds.py | 160 | ||||
-rw-r--r-- | release/scripts/io/import_scene_obj.py | 6 | ||||
-rw-r--r-- | release/scripts/io/netrender/__init__.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/balancing.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/client.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/master.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/master_html.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/model.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/operators.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/slave.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/ui.py | 2 | ||||
-rw-r--r-- | release/scripts/io/netrender/utils.py | 2 |
20 files changed, 52 insertions, 185 deletions
diff --git a/release/scripts/io/engine_render_pov.py b/release/scripts/io/engine_render_pov.py index 8ce417a4fab..33e6dee22d5 100644 --- a/release/scripts/io/engine_render_pov.py +++ b/release/scripts/io/engine_render_pov.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/export_3ds.py b/release/scripts/io/export_3ds.py index 409976d4c7c..af6dd7cd59c 100644 --- a/release/scripts/io/export_3ds.py +++ b/release/scripts/io/export_3ds.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -48,7 +48,7 @@ from the lib3ds project (http://lib3ds.sourceforge.net/) sourcecode. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** # -------------------------------------------------------------------------- @@ -1060,8 +1060,8 @@ def save_3ds(filename, context): # make a kf object node for the object: kfdata.add_subchunk(make_kf_obj_node(ob, name_to_id)) ''' -# if not blender_mesh.users: - bpy.data.meshes.remove(blender_mesh) + if not blender_mesh.users: + bpy.data.meshes.remove(blender_mesh) # blender_mesh.verts = None i+=i diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index 40548a2703c..3574059f942 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -44,7 +44,7 @@ http://wiki.blender.org/index.php/Scripts/Manual/Export/autodesk_fbx # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** # -------------------------------------------------------------------------- diff --git a/release/scripts/io/export_mdd.py b/release/scripts/io/export_mdd.py index c2599b3e325..f8fd2f34d2e 100644 --- a/release/scripts/io/export_mdd.py +++ b/release/scripts/io/export_mdd.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -43,7 +43,7 @@ Be sure not to use modifiers that change the number or order of verts in the mes # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 81af5d3551d..add54e8e156 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -928,7 +928,11 @@ class ExportOBJ(bpy.types.Operator): def execute(self, context): - do_export(self.properties.path, context, + path = self.properties.path + if not path.lower().endswith(".obj"): + path += ".obj" + + do_export(path, context, EXPORT_TRI=self.properties.use_triangles, EXPORT_EDGES=self.properties.use_edges, EXPORT_NORMALS=self.properties.use_normals, diff --git a/release/scripts/io/export_ply.py b/release/scripts/io/export_ply.py index d8f9b690c9f..d0712d820fd 100644 --- a/release/scripts/io/export_ply.py +++ b/release/scripts/io/export_ply.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -42,7 +42,7 @@ Only one mesh can be exported at a time. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Vector rounding se we can use as keys # # Updated on Aug 11, 2008 by Campbell Barton @@ -127,23 +127,20 @@ def write(filename, scene, ob, \ vertexColors = False if faceUV: - active_uv_layer = None - for lay in mesh.uv_textures: - if lay.active: - active_uv_layer = lay.data - break + active_uv_layer = mesh.active_uv_texture if not active_uv_layer: EXPORT_UV = False faceUV = None + else: + active_uv_layer = active_uv_layer.data if vertexColors: - active_col_layer = None - for lay in mesh.vertex_colors: - if lay.active: - active_col_layer = lay.data + active_col_layer = mesh.active_vertex_color if not active_col_layer: EXPORT_COLORS = False vertexColors = None + else: + active_col_layer = active_col_layer.data # incase color = uvcoord = uvcoord_key = normal = normal_key = None diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py index 0f90593e756..c7210e5ceb7 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -56,7 +56,7 @@ Known issues:<br> # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** # diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index f6626e8fb1e..7b455fb4b28 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/import_scene_3ds.py b/release/scripts/io/import_scene_3ds.py index 971d62d8e15..29289ae0970 100644 --- a/release/scripts/io/import_scene_3ds.py +++ b/release/scripts/io/import_scene_3ds.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -130,7 +130,7 @@ Loader is based on 3ds loader from www.gametutorials.com (Thanks DigiBen). # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** # -------------------------------------------------------------------------- @@ -146,41 +146,9 @@ from import_scene_obj import unpack_face_list, load_image import bpy import Mathutils -# import Blender -# from Blender import Mesh, Object, Material, Image, Texture, Lamp, Mathutils -# from Blender.Mathutils import Vector -# import BPyImage - -# import BPyMessages - -# try: -# from struct import calcsize, unpack -# except: -# calcsize= unpack= None - - - -# # If python version is less than 2.4, try to get set stuff from module -# try: -# set -# except: -# from sets import Set as set - BOUNDS_3DS = [] -#this script imports uvcoords as sticky vertex coords -#this parameter enables copying these to face uv coords -#which shold be more useful. - -def createBlenderTexture(material, name, image): - texture = bpy.data.textures.new(name) - texture.setType('Image') - texture.image = image - material.setTexture(0, texture, Texture.TexCo.UV, Texture.MapTo.COL) - - - ###################################################### # Data Structures ###################################################### @@ -294,11 +262,8 @@ def read_chunk(file, chunk): def read_string(file): #read in the characters till we get a null character s = b'' -# s = '' while not s.endswith(b'\x00'): -# while not s.endswith('\x00'): s += struct.unpack('<c', file.read(1))[0] -# s += struct.unpack( '<c', file.read(1) )[0] #print 'string: ',s s = str(s[:-1], 'ASCII') @@ -327,29 +292,17 @@ def skip_to_end(file, skip_chunk): def add_texture_to_material(image, texture, material, mapto): -# if mapto=='DIFFUSE': -# map = Texture.MapTo.COL -# elif mapto=='SPECULAR': -# map = Texture.MapTo.SPEC -# elif mapto=='OPACITY': -# map = Texture.MapTo.ALPHA -# elif mapto=='BUMP': -# map = Texture.MapTo.NOR -# else: + #print('assigning %s to %s' % (texture, material)) + if mapto not in ("COLOR", "SPECULARITY", "ALPHA", "NORMAL"): print('/tError: Cannot map to "%s"\n\tassuming diffuse color. modify material "%s" later.' % (mapto, material.name)) mapto = "COLOR" -# map = Texture.MapTo.COL - if image: texture.image = image + if image: + texture.image = image # if image: texture.setImage(image) # double check its an image. material.add_texture(texture, "UV", mapto) -# free_tex_slots = [i for i, tex in enumerate( material.getTextures() ) if tex == None] -# if not free_tex_slots: -# print('/tError: Cannot add "%s" map. 10 Texture slots alredy used.' % mapto) -# else: -# material.setTexture(free_tex_slots[0],texture,Texture.TexCo.UV,map) def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): @@ -436,7 +389,6 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): if bmesh.faces and (contextMeshUV or img): bmesh.add_uv_texture() -# bmesh.faceUV = 1 for ii, i in enumerate(faces): # Mapped index- faces may have not been added- if so, then map to the correct index @@ -461,7 +413,9 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): # targetFace.uv = [contextMeshUV[vindex] for vindex in myContextMesh_facels[i]] if img: uf.image = img -# targetFace.image = img + + # to get this image to show up in 'Textured' shading mode + uf.tex = True # bmesh.transform(contextMatrix) ob = bpy.data.objects.new(tempName, 'MESH') @@ -507,7 +461,7 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): return [float(col)/255 for col in struct.unpack('<3B', temp_data)] # data [0,1,2] == rgb def read_texture(new_chunk, temp_chunk, name, mapto): - new_texture = bpy.data.textures.new('Diffuse') + new_texture = bpy.data.textures.new(name) new_texture.type = 'IMAGE' new_texture = new_texture.recast_type() @@ -657,96 +611,15 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): elif (new_chunk.ID == MAT_TEXTURE_MAP): read_texture(new_chunk, temp_chunk, "Diffuse", "COLOR") -# #print 'elif (new_chunk.ID==MAT_TEXTURE_MAP):' -# new_texture= bpy.data.textures.new('Diffuse') -# new_texture.setType('Image') -# img = None -# while (new_chunk.bytes_read<new_chunk.length): -# #print 'MAT_TEXTURE_MAP..while', new_chunk.bytes_read, new_chunk.length -# read_chunk(file, temp_chunk) - -# if (temp_chunk.ID==MAT_MAP_FILENAME): -# texture_name=read_string(file) -# #img= TEXTURE_DICT[contextMaterial.name]= BPyImage.comprehensiveImageLoad(texture_name, FILENAME) -# img= TEXTURE_DICT[contextMaterial.name]= BPyImage.comprehensiveImageLoad(texture_name, FILENAME, PLACE_HOLDER= False, RECURSIVE= IMAGE_SEARCH) -# new_chunk.bytes_read += (len(texture_name)+1) #plus one for the null character that gets removed - -# else: -# skip_to_end(file, temp_chunk) - -# new_chunk.bytes_read+= temp_chunk.bytes_read - -# #add the map to the material in the right channel -# if img: -# add_texture_to_material(img, new_texture, contextMaterial, 'DIFFUSE') elif (new_chunk.ID == MAT_SPECULAR_MAP): read_texture(new_chunk, temp_chunk, "Specular", "SPECULARITY") -# #print 'elif (new_chunk.ID == MAT_SPECULAR_MAP):' -# new_texture = bpy.data.textures.new('Specular') -# new_texture.setType('Image') -# img = None -# while (new_chunk.bytes_read < new_chunk.length): -# read_chunk(file, temp_chunk) - -# if (temp_chunk.ID == MAT_MAP_FILENAME): -# texture_name = read_string(file) -# #img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME) -# img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME, PLACE_HOLDER=False, RECURSIVE=IMAGE_SEARCH) -# new_chunk.bytes_read+= (len(texture_name)+1) #plus one for the null character that gets removed -# else: -# skip_to_end(file, temp_chunk) - -# new_chunk.bytes_read += temp_chunk.bytes_read - -# #add the map to the material in the right channel -# if img: -# add_texture_to_material(img, new_texture, contextMaterial, 'SPECULAR') elif (new_chunk.ID == MAT_OPACITY_MAP): read_texture(new_chunk, temp_chunk, "Opacity", "ALPHA") -# #print 'new_texture = Blender.Texture.New('Opacity')' -# new_texture = bpy.data.textures.new('Opacity') -# new_texture.setType('Image') -# img = None -# while (new_chunk.bytes_read < new_chunk.length): -# read_chunk(file, temp_chunk) - -# if (temp_chunk.ID == MAT_MAP_FILENAME): -# texture_name = read_string(file) -# #img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME) -# img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME, PLACE_HOLDER=False, RECURSIVE=IMAGE_SEARCH) -# new_chunk.bytes_read += (len(texture_name)+1) #plus one for the null character that gets removed -# else: -# skip_to_end(file, temp_chunk) - -# new_chunk.bytes_read += temp_chunk.bytes_read -# #add the map to the material in the right channel -# if img: -# add_texture_to_material(img, new_texture, contextMaterial, 'OPACITY') elif (new_chunk.ID == MAT_BUMP_MAP): read_texture(new_chunk, temp_chunk, "Bump", "NORMAL") -# #print 'elif (new_chunk.ID == MAT_BUMP_MAP):' -# new_texture = bpy.data.textures.new('Bump') -# new_texture.setType('Image') -# img = None -# while (new_chunk.bytes_read < new_chunk.length): -# read_chunk(file, temp_chunk) - -# if (temp_chunk.ID == MAT_MAP_FILENAME): -# texture_name = read_string(file) -# #img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME) -# img = BPyImage.comprehensiveImageLoad(texture_name, FILENAME, PLACE_HOLDER=False, RECURSIVE=IMAGE_SEARCH) -# new_chunk.bytes_read += (len(texture_name)+1) #plus one for the null character that gets removed -# else: -# skip_to_end(file, temp_chunk) - -# new_chunk.bytes_read += temp_chunk.bytes_read - -# #add the map to the material in the right channel -# if img: -# add_texture_to_material(img, new_texture, contextMaterial, 'BUMP') elif (new_chunk.ID == MAT_TRANSPARENCY): #print 'elif (new_chunk.ID == MAT_TRANSPARENCY):' @@ -852,7 +725,6 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): temp_data = file.read(STRUCT_SIZE_2FLOAT) new_chunk.bytes_read += STRUCT_SIZE_2FLOAT #2 float x 4 bytes each return Mathutils.Vector( struct.unpack('<2f', temp_data) ) -# return Vector( struct.unpack('<2f', temp_data) ) contextMeshUV = [ getuv() for i in range(num_uv) ] @@ -863,7 +735,6 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): new_chunk.bytes_read += STRUCT_SIZE_4x3MAT contextMatrix_rot = Mathutils.Matrix(\ -# contextMatrix_rot = Blender.Mathutils.Matrix(\ data[:3] + [0],\ data[3:6] + [0],\ data[6:9] + [0],\ @@ -1089,16 +960,9 @@ def load_3ds(filename, context, IMPORT_CONSTRAIN_BOUNDS=10.0, IMAGE_SEARCH=True, print('finished importing: "%s" in %.4f sec.' % (filename, (time.clock()-time1))) # print('finished importing: "%s" in %.4f sec.' % (filename, (Blender.sys.time()-time1))) file.close() -# Blender.Window.WaitCursor(0) DEBUG = False -# if __name__=='__main__' and not DEBUG: -# if calcsize == None: -# Blender.Draw.PupMenu('Error%t|a full python installation not found') -# else: -# Blender.Window.FileSelector(load_3ds, 'Import 3DS', '*.3ds') - # For testing compatibility #load_3ds('/metavr/convert/vehicle/truck_002/TruckTanker1.3DS', False) #load_3ds('/metavr/archive/convert/old/arranged_3ds_to_hpx-2/only-need-engine-trains/Engine2.3DS', False) @@ -1151,7 +1015,9 @@ class IMPORT_OT_autodesk_3ds(bpy.types.Operator): # to the class instance from the operator settings before calling. path = StringProperty(name="File Path", description="File path used for importing the 3DS file", maxlen= 1024, default= "") - + filename = StringProperty(name="File Name", description="Name of the file.") + directory = StringProperty(name="Directory", description="Directory of the file.") + # size_constraint = FloatProperty(name="Size Constraint", description="Scale the model by 10 until it reacehs the size constraint. Zero Disables.", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=10.0), # search_images = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True), # apply_matrix = BoolProperty(name="Transform Fix", description="Workaround for object transformations importing incorrectly", default=False), diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py index c703a9789bf..1ebf08451a6 100644 --- a/release/scripts/io/import_scene_obj.py +++ b/release/scripts/io/import_scene_obj.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### @@ -46,7 +46,7 @@ Note, This loads mesh objects and materials only, nurbs and curves are not suppo # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ***** END GPL LICENCE BLOCK ***** # -------------------------------------------------------------------------- @@ -1594,7 +1594,7 @@ class IMPORT_OT_obj(bpy.types.Operator): # disabled this option because in old code a handler for it disabled SPLIT* params, it's not passed to load_obj # KEEP_VERT_ORDER = BoolProperty(name="Keep Vert Order", description="Keep vert and face order, disables split options, enable for morph targets", default= True) ROTATE_X90 = BoolProperty(name="-X90", description="Rotate X 90.", default= True) - CLAMP_SIZE = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.01, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) + CLAMP_SIZE = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) POLYGROUPS = BoolProperty(name="Poly Groups", description="Import OBJ groups as vertex groups.", default= True) IMAGE_SEARCH = BoolProperty(name="Image Search", description="Search subdirs for any assosiated images (Warning, may be slow)", default= True) diff --git a/release/scripts/io/netrender/__init__.py b/release/scripts/io/netrender/__init__.py index ef50df3435a..0ba6b76c653 100644 --- a/release/scripts/io/netrender/__init__.py +++ b/release/scripts/io/netrender/__init__.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/balancing.py b/release/scripts/io/netrender/balancing.py index d3041466326..95f345249f2 100644 --- a/release/scripts/io/netrender/balancing.py +++ b/release/scripts/io/netrender/balancing.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index 01130907553..26f6b6809a2 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/master.py b/release/scripts/io/netrender/master.py index 0e3602563b4..4c9116982b5 100644 --- a/release/scripts/io/netrender/master.py +++ b/release/scripts/io/netrender/master.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/master_html.py b/release/scripts/io/netrender/master_html.py index 3557361b8e9..e5feac86e12 100644 --- a/release/scripts/io/netrender/master_html.py +++ b/release/scripts/io/netrender/master_html.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/model.py b/release/scripts/io/netrender/model.py index c5b4af47aa1..8b0f50ba848 100644 --- a/release/scripts/io/netrender/model.py +++ b/release/scripts/io/netrender/model.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/operators.py b/release/scripts/io/netrender/operators.py index 232d70a25be..f5e665f9947 100644 --- a/release/scripts/io/netrender/operators.py +++ b/release/scripts/io/netrender/operators.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/slave.py b/release/scripts/io/netrender/slave.py index 7a1e2798913..d24490385fb 100644 --- a/release/scripts/io/netrender/slave.py +++ b/release/scripts/io/netrender/slave.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index db402a21757..b6c3815048a 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### diff --git a/release/scripts/io/netrender/utils.py b/release/scripts/io/netrender/utils.py index c9c4a2931a7..ac4a9307f81 100644 --- a/release/scripts/io/netrender/utils.py +++ b/release/scripts/io/netrender/utils.py @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ##### END GPL LICENSE BLOCK ##### |