diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-12-28 02:37:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-12-28 02:37:13 +0300 |
| commit | 310d41733402ffcd9c8ff1eda2a4ab7810922167 (patch) | |
| tree | f7d2f96ab774d2b9cd7f6188ac308330435d3f34 /source/blender/editors/animation/anim_channels_defines.c | |
| parent | 351f5d1837d3660d1f9fb8921b60513787737442 (diff) | |
Curve/Nurbs/Font Animation Bugfixes:
* NURBS and Font animation data now appear in the animation editors.
* Fixed depsgraph tagging code for determining if the AnimData attached to object data blocks (i.e. animation for curve or lamp data) needs to be tagged for updates on frame changes. This means that animating curve settings now works.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 0a71f79f132..5398238a43b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -66,6 +66,7 @@ #include "BKE_animsys.h" #include "BKE_action.h" +#include "BKE_curve.h" #include "BKE_depsgraph.h" #include "BKE_fcurve.h" #include "BKE_key.h" @@ -1303,7 +1304,17 @@ static bAnimChannelType ACF_DSCAM= // TODO: just get this from RNA? static int acf_dscur_icon(bAnimListElem *ale) { - return ICON_CURVE_DATA; + Curve *cu= (Curve *)ale->data; + short obtype= curve_type(cu); + + switch (obtype) { + case OB_FONT: + return ICON_FONT_DATA; + case OB_SURF: + return ICON_SURFACE_DATA; + default: + return ICON_CURVE_DATA; + } } /* get the appropriate flag(s) for the setting when it is valid */ |