diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-18 17:16:34 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-18 17:16:34 +0400 |
| commit | 4fae9113834651bc71ee018eaebf526e87ac304b (patch) | |
| tree | 3962fc87797389c214782f545077f9b22ba9e5d0 /source/blender/blenkernel/intern/idcode.c | |
| parent | f5247d94250b134820c41ac3c27e1959d068dd73 (diff) | |
| parent | c04199b3a1b5ac2894bef46395852bd2bc462f62 (diff) | |
Merged changes in the trunk up to revision 31440.
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 bc5740b1638..680866e6001 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -48,7 +48,7 @@ static IDType idtypes[]= { { ID_BR, "Brush", "brushes", IDTYPE_FLAGS_ISLINKABLE}, { ID_CA, "Camera", "cameras", IDTYPE_FLAGS_ISLINKABLE}, { ID_CU, "Curve", "curves", IDTYPE_FLAGS_ISLINKABLE}, - { ID_GD, "GPencil", "gpencil", IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */ + { ID_GD, "GPencil", "grease_pencil",IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */ { ID_GR, "Group", "groups", IDTYPE_FLAGS_ISLINKABLE}, { ID_ID, "ID", "ids", 0}, /* plural is fake */ { ID_IM, "Image", "images", IDTYPE_FLAGS_ISLINKABLE}, |