Merged changes in the trunk up to revision 44039.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 12 Feb 2012 00:09:48 +0000 (00:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 12 Feb 2012 00:09:48 +0000 (00:09 +0000)
13 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/shadeoutput.c

Simple merge
Simple merge
index a7aa4836be5e26868690e8bb23338ba019a68087,b52576ec465ebdbdea240d9c8df2d416f74185e9..c7dec3d8f4b2c2f99033d5d3da1a7628c3920f30
@@@ -58,10 -58,9 +58,10 @@@ 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}, 
        { ID_LT,                "Lattice",      "lattices",             IDTYPE_FLAGS_ISLINKABLE}, 
        { ID_MA,                "Material", "materials",        IDTYPE_FLAGS_ISLINKABLE}, 
        { ID_MB,                "Metaball", "metaballs",        IDTYPE_FLAGS_ISLINKABLE},