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>2011-03-25 05:12:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-03-25 05:12:44 +0300
commit0c03fa78c10f04283512f2a5a4557d86c72d6f29 (patch)
tree257e95d18d20a923c52f4aef811787e956b93703 /release/scripts/startup/bl_ui/properties_data_mesh.py
parentb5100196021d12129c0d7e80be7e202c319ea120 (diff)
fix [#26601] Python error when use of autocomplete
Was a naming collision with 'keys' python method, reserve keys/items/values/get for python. Updated animsys_update.py for shapekey data paths. renamed: Particle.hair --> hair_keys Particle.keys --> particle_keys Key.keys --> key_blocks EnumProperty.items --> enum_items KeyMap.items --> keymap_items noted: http://wiki.blender.org/index.php/Dev:2.5/Py/API/Updates#Since_2.56a
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_mesh.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_mesh.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index d6557fda8a2..62e60cd7a16 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -188,7 +188,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel):
rows = 2
if kb:
rows = 5
- row.template_list(key, "keys", ob, "active_shape_key_index", rows=rows)
+ row.template_list(key, "key_blocks", ob, "active_shape_key_index", rows=rows)
col = row.column()
@@ -243,7 +243,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel):
col.active = enable_edit_value
col.label(text="Blend:")
col.prop_search(kb, "vertex_group", ob, "vertex_groups", text="")
- col.prop_search(kb, "relative_key", key, "keys", text="")
+ col.prop_search(kb, "relative_key", key, "key_blocks", text="")
else:
row = layout.row()