diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/editors/animation/anim_draw.c | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/animation/anim_draw.c')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 33a5447698a..ed3d228a93e 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -289,12 +289,22 @@ static float normalization_factor_get(Scene *scene, FCurve *fcu, short flag, flo if (flag & ANIM_UNITCONV_NORMALIZE_FREEZE) { if (r_offset) *r_offset = fcu->prev_offset; + if (fcu->prev_norm_factor == 0.0f) { + /* Happens when Auto Normalize was disabled before + * any curves were displayed. + */ + return 1.0f; + } return fcu->prev_norm_factor; } if (G.moving & G_TRANSFORM_FCURVES) { if (r_offset) *r_offset = fcu->prev_offset; + if (fcu->prev_norm_factor == 0.0f) { + /* Same as above. */ + return 1.0f; + } return fcu->prev_norm_factor; } @@ -342,7 +352,7 @@ static float normalization_factor_get(Scene *scene, FCurve *fcu, short flag, flo } offset = -min_coord - range / 2.0f; } - + BLI_assert(factor != 0.0f); if (r_offset) { *r_offset = offset; } |