diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-07 15:51:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-07 15:51:47 +0300 |
| commit | bb571c67cb2ead3d354e445a3c44604925422ffc (patch) | |
| tree | 6b08ae7fab1dbe2cbdc82a9f1ae7cc889b03d0c8 /release | |
| parent | 3238730e3678394ed6ecd3d2ce634f9502400d6e (diff) | |
mat/lamp/world.textures -> texture_slots
object.materials -> material_slots
since neither contain textures or materials directly.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/io/export_3ds.py | 2 | ||||
| -rw-r--r-- | release/scripts/io/export_obj.py | 4 | ||||
| -rw-r--r-- | release/scripts/ui/properties_material.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/release/scripts/io/export_3ds.py b/release/scripts/io/export_3ds.py index ff93670076d..409976d4c7c 100644 --- a/release/scripts/io/export_3ds.py +++ b/release/scripts/io/export_3ds.py @@ -460,7 +460,7 @@ class _3ds_chunk(object): def get_material_images(material): # blender utility func. if material: - return [s.texture.image for s in material.textures if s and s.texture.type == 'IMAGE' and s.texture.image] + return [s.texture.image for s in material.texture_slots if s and s.texture.type == 'IMAGE' and s.texture.image] return [] # images = [] diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 241325c7d33..81af5d3551d 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -134,7 +134,7 @@ def write_mtl(scene, filename, copy_images): # file.write('map_Kd %s\n' % img.filename.split('\\')[-1].split('/')[-1]) # Diffuse mapping image elif mat: # No face image. if we havea material search for MTex image. - for mtex in mat.textures: + for mtex in mat.texture_slots: if mtex and mtex.texture.type == 'IMAGE': try: filename = copy_image(mtex.texture.image) @@ -176,7 +176,7 @@ def copy_images(dest_dir): # Get MTex images if mat: - for mtex in mat.textures: + for mtex in mat.texture_slots: if mtex and mtex.texture.type == 'IMAGE': image_tex = mtex.texture.image if image_tex: diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py index dfd182283e8..46f43014d62 100644 --- a/release/scripts/ui/properties_material.py +++ b/release/scripts/ui/properties_material.py @@ -98,7 +98,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel): if ob: row = layout.row() - row.template_list(ob, "materials", ob, "active_material_index", rows=2) + row.template_list(ob, "material_slots", ob, "active_material_index", rows=2) col = row.column(align=True) col.operator("object.material_slot_add", icon='ZOOMIN', text="") diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 7de0df2dfe4..f52cb9840c6 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -98,7 +98,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel): if tex_collection: row = layout.row() - row.template_list(idblock, "textures", idblock, "active_texture_index", rows=2) + row.template_list(idblock, "texture_slots", idblock, "active_texture_index", rows=2) col = row.column(align=True) col.operator("texture.slot_move", text="", icon='TRIA_UP').type = 'UP' |