Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-07 15:51:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-07 15:51:47 +0300
commitbb571c67cb2ead3d354e445a3c44604925422ffc (patch)
tree6b08ae7fab1dbe2cbdc82a9f1ae7cc889b03d0c8 /release/scripts/ui
parent3238730e3678394ed6ecd3d2ce634f9502400d6e (diff)
mat/lamp/world.textures -> texture_slots
object.materials -> material_slots since neither contain textures or materials directly.
Diffstat (limited to 'release/scripts/ui')
-rw-r--r--release/scripts/ui/properties_material.py2
-rw-r--r--release/scripts/ui/properties_texture.py2
2 files changed, 2 insertions, 2 deletions
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'