diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-12 04:09:48 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-12 04:09:48 +0400 |
| commit | 5c5685f6c5bfc9a6c838aa837f1b5980127bcbc3 (patch) | |
| tree | 3be4711bfe8b23cecee40c0cb9d0c041b66e7c0f /source/blender/blenkernel/intern/idcode.c | |
| parent | eecfa9473c985024128567fda33f8fd19bbda7a8 (diff) | |
| parent | 24fc50907d811823c2d78fd03080376b0089c6e9 (diff) | |
Merged changes in the trunk up to revision 44039.
Diffstat (limited to 'source/blender/blenkernel/intern/idcode.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index a7aa4836be5..c7dec3d8f4b 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -58,7 +58,7 @@ static IDType idtypes[]= { { ID_ID, "ID", "ids", 0}, /* plural is fake */ { ID_IM, "Image", "images", IDTYPE_FLAGS_ISLINKABLE}, { ID_IP, "Ipo", "ipos", IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */ - { ID_KE, "Key", "keys", 0}, + { ID_KE, "Key", "shape_keys", 0}, { ID_LA, "Lamp", "lamps", IDTYPE_FLAGS_ISLINKABLE}, { ID_LI, "Library", "libraries", 0}, { ID_LS, "FreestyleLineStyle", "linestyles", IDTYPE_FLAGS_ISLINKABLE}, |