diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-09-04 02:49:30 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-09-04 02:49:30 +0400 |
| commit | 972c4640dc53c177791de00fad13a8272f7f040f (patch) | |
| tree | bf50f16e6409417f9372162a061703ec70e33336 /source/blender/editors/animation/anim_channels_defines.c | |
| parent | 60e5abe71f8c219f7ba6dcb8ac9d109ca5610715 (diff) | |
Fix #36649: Drivers for Freestyle parameters in Render Layer panel don't appear in Graph Editor.
The channels define code in ANIM_init_channel_typeinfo_data() was not synchronized with the
definition of channel types (eAnim_ChannelType) in ED_anim_api.h.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 845ad72d7aa..48e7df1834b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2781,6 +2781,9 @@ static void ANIM_init_channel_typeinfo_data(void) if (ACF_INIT) { ACF_INIT = 0; + /* NOTE: need to keep the order of these synchronized with the definition of + * channel types (eAnim_ChannelType) in ED_anim_api.h + */ animchannelTypeInfo[type++] = NULL; /* None */ animchannelTypeInfo[type++] = NULL; /* AnimData */ animchannelTypeInfo[type++] = NULL; /* Special */ @@ -2808,8 +2811,8 @@ static void ANIM_init_channel_typeinfo_data(void) animchannelTypeInfo[type++] = &ACF_DSMESH; /* Mesh Channel */ 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_DSSPK; /* Speaker Channel */ animchannelTypeInfo[type++] = &ACF_SHAPEKEY; /* ShapeKey */ |