diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-22 14:12:44 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-22 14:12:44 +0300 |
| commit | 97ee7f8609bed555ff4bd371b7e25d13b2d6a0d6 (patch) | |
| tree | 0aadae430c5c7d84c820fd567d815c455227d13d /source/blender/editors/animation | |
| parent | 48c58bd9138ad88d8aaa24ad9d6d67e1303e7905 (diff) | |
| parent | 493c6b622fe3fb80243dfeac29f9399ac6fc4a8c (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/physics/particle_edit.c
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_ipo_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index ae6894ac546..fc6f4036d02 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -192,7 +192,7 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) #define HSV_BANDWIDTH 0.3f /* 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 fcurve_rainbow(unsigned int cur, unsigned int tot, float *out) void getcolor_fcurve_rainbow(int cur, int tot, float out[3]) { float hsv[3], fac; |