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 /source/blender/makesrna/intern/rna_key.c
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 'source/blender/makesrna/intern/rna_key.c')
-rw-r--r--source/blender/makesrna/intern/rna_key.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index 0edd46c089a..48cab3b13d1 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -85,7 +85,7 @@ void rna_ShapeKey_name_set(PointerRNA *ptr, const char *value)
}
/* fix all the animation data which may link to this */
- BKE_all_animdata_fix_paths_rename("keys", oldname, kb->name);
+ BKE_all_animdata_fix_paths_rename("key_blocks", oldname, kb->name);
}
static void rna_ShapeKey_value_set(PointerRNA *ptr, float value)
@@ -350,7 +350,7 @@ static char *rna_ShapeKey_path(PointerRNA *ptr)
if ((id) && (GS(id->name) != ID_KE))
return BLI_sprintfN("shape_keys.keys[\"%s\"]", kb->name);
else
- return BLI_sprintfN("keys[\"%s\"]", kb->name);
+ return BLI_sprintfN("key_blocks[\"%s\"]", kb->name);
}
static void rna_Key_update_data(Main *bmain, Scene *scene, PointerRNA *ptr)
@@ -434,9 +434,9 @@ static char *rna_ShapeKeyPoint_path(PointerRNA *ptr)
int index = rna_ShapeKeyPoint_get_index(key, kb, point);
if (GS(id->name) == ID_KE)
- return BLI_sprintfN("keys[\"%s\"].data[%d]", kb->name, index);
+ return BLI_sprintfN("key_blocks[\"%s\"].data[%d]", kb->name, index);
else
- return BLI_sprintfN("shape_keys.keys[\"%s\"].data[%d]", kb->name, index);
+ return BLI_sprintfN("shape_keys.key_blocks[\"%s\"].data[%d]", kb->name, index);
}
else
return NULL; // XXX: there's really no way to resolve this...
@@ -599,10 +599,10 @@ static void rna_def_key(BlenderRNA *brna)
RNA_def_property_pointer_sdna(prop, NULL, "refkey");
RNA_def_property_ui_text(prop, "Reference Key", "");
- prop= RNA_def_property(srna, "keys", PROP_COLLECTION, PROP_NONE);
+ prop= RNA_def_property(srna, "key_blocks", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "block", NULL);
RNA_def_property_struct_type(prop, "ShapeKey");
- RNA_def_property_ui_text(prop, "Keys", "Shape keys");
+ RNA_def_property_ui_text(prop, "Key Blocks", "Shape keys");
rna_def_animdata_common(srna);