Merged changes in the trunk up to revision 49090.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 20 Jul 2012 23:12:05 +0000 (23:12 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 20 Jul 2012 23:12:05 +0000 (23:12 +0000)
15 files changed:
1  2 
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/creator/CMakeLists.txt

index 6331dd5152797bd71e9863cf67f5a8a5c7a314ad,d4b30814403f1796c896798416efef230c8f4bd3..e890b8f2aba20cd9b27cdcc786c29f3873e0f524
@@@ -2805,16 -2727,15 +2805,16 @@@ static void ANIM_init_channel_typeinfo_
                animchannelTypeInfo[type++] = &ACF_DSTEX;        /* Texture Channel */
                animchannelTypeInfo[type++] = &ACF_DSLAT;        /* Lattice Channel */
                animchannelTypeInfo[type++] = &ACF_DSSPK;        /* Speaker Channel */
 +              animchannelTypeInfo[type++] = &ACF_DSLINESTYLE;  /* LineStyle Channel */
+               
                animchannelTypeInfo[type++] = &ACF_SHAPEKEY;     /* ShapeKey */
+               
                animchannelTypeInfo[type++] = &ACF_GPD;          /* Grease Pencil Datablock */
                animchannelTypeInfo[type++] = &ACF_GPL;          /* Grease Pencil Layer */
+               
                animchannelTypeInfo[type++] = &ACF_MASKDATA;     /* Mask Datablock */
                animchannelTypeInfo[type++] = &ACF_MASKLAYER;    /* Mask Layer */
+               
                // TODO: these types still need to be implemented!!!
                // probably need a few extra flags for these special cases...
                animchannelTypeInfo[type++] = NULL;              /* NLA Track */
Simple merge