diff options
Diffstat (limited to 'source/blender/editors/animation/anim_ipo_utils.c')
-rw-r--r-- | source/blender/editors/animation/anim_ipo_utils.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index 4bc2654e581..3e2212c15bb 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -37,10 +37,11 @@ #include "BLI_blenlib.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" @@ -74,7 +75,8 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) /* try to resolve the path */ if (RNA_path_resolve(&id_ptr, fcu->rna_path, &ptr, &prop)) { - char *structname=NULL, *propname=NULL, *arrayname=NULL, arrayindbuf[16]; + char *structname=NULL, *propname=NULL, arrayindbuf[16]; + const char *arrayname=NULL; short free_structname = 0; /* For now, name will consist of 3 parts: struct-name, property name, array index @@ -172,14 +174,14 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) /* step between the major distinguishable color bands of the primary colors */ #define HSV_BANDWIDTH 0.3f -/* used to determine the colour of F-Curves with FCURVE_COLOR_AUTO_RAINBOW set */ +/* used to determine the color of F-Curves with FCURVE_COLOR_AUTO_RAINBOW set */ //void fcurve_rainbow (unsigned int cur, unsigned int tot, float *out) void getcolor_fcurve_rainbow (int cur, int tot, float *out) { float hue, val, sat, fac; int grouping; - /* we try to divide the colours into groupings of n colors, + /* we try to divide the color into groupings of n colors, * where n is: * 3 - for 'odd' numbers of curves - there should be a majority of triplets of curves * 4 - for 'even' numbers of curves - there should be a majority of quartets of curves |