Merged changes in the trunk up to revision 34193.
[blender.git] / source / blender / editors / animation / anim_channels_edit.c
index 9d6b6d80a78ec78f0406056b5dd0d177095c0a9a..f4e3602343f2240b47113cb1f3cbf1fd9ade3a17 100644 (file)
@@ -32,6 +32,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
@@ -114,6 +116,8 @@ void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype, int
                        case ANIMTYPE_DSMBALL:
                        case ANIMTYPE_DSARM:
                        case ANIMTYPE_DSMESH:
+                       case ANIMTYPE_DSTEX:
+                       case ANIMTYPE_DSLAT:
                        {
                                /* need to verify that this data is valid for now */
                                if (ale->adt) {
@@ -157,6 +161,7 @@ void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype, int
                        case ANIMTYPE_DSMBALL:
                        case ANIMTYPE_DSARM:
                        case ANIMTYPE_DSMESH:
+                       case ANIMTYPE_DSLAT:
                        {
                                /* need to verify that this data is valid for now */
                                // XXX: ale may be null!
@@ -234,6 +239,7 @@ void ANIM_deselect_anim_channels (bAnimContext *ac, void *data, short datatype,
                                case ANIMTYPE_DSMESH:
                                case ANIMTYPE_DSNTREE:
                                case ANIMTYPE_DSTEX:
+                               case ANIMTYPE_DSLAT:
                                case ANIMTYPE_DSLINESTYLE:
                                {
                                        if ((ale->adt) && (ale->adt->flag & ADT_UI_SELECTED))
@@ -318,6 +324,7 @@ void ANIM_deselect_anim_channels (bAnimContext *ac, void *data, short datatype,
                        case ANIMTYPE_DSMESH:
                        case ANIMTYPE_DSNTREE:
                        case ANIMTYPE_DSTEX:
+                       case ANIMTYPE_DSLAT:
                        case ANIMTYPE_DSLINESTYLE:
                        {
                                /* need to verify that this data is valid for now */
@@ -1940,6 +1947,7 @@ static int mouse_anim_channels (bAnimContext *ac, float UNUSED(x), int channel_i
                case ANIMTYPE_DSMESH:
                case ANIMTYPE_DSNTREE:
                case ANIMTYPE_DSTEX:
+               case ANIMTYPE_DSLAT:
                case ANIMTYPE_DSLINESTYLE:
                {
                        /* sanity checking... */