[Bf-blender-cvs] [22b3990] blender-v2.78-release: Fix non-finite normalization factor in certain cases

Sergey Sharybin noreply at git.blender.org
Thu Sep 22 11:15:34 CEST 2016


Commit: 22b39901e39e0a0af804c5a574e016b9ba93f917
Author: Sergey Sharybin
Date:   Thu Sep 22 10:04:51 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB22b39901e39e0a0af804c5a574e016b9ba93f917

Fix non-finite normalization factor in certain cases

===================================================================

M	source/blender/editors/animation/anim_draw.c

===================================================================

diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index dbc9c8b..f8b98eb 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -343,12 +343,13 @@ static float normalization_factor_get(Scene *scene, FCurve *fcu, short flag, flo
 			}
 		}
 
-		range = max_coord - min_coord;
-
-		if (range > FLT_EPSILON) {
-			factor = 2.0f / range;
+		if (max_coord > min_coord) {
+			range = max_coord - min_coord;
+			if (range > FLT_EPSILON) {
+				factor = 2.0f / range;
+			}
+			offset = -min_coord - range / 2.0f;
 		}
-		offset = -min_coord - range / 2.0f;
 	}
 	BLI_assert(factor != 0.0f);
 	if (r_offset) {




More information about the Bf-blender-cvs mailing list