[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61223] trunk/blender/source/blender: replace IS_EQ -> IS_EQF for use with floats.

Campbell Barton ideasman42 at gmail.com
Sun Nov 10 13:56:50 CET 2013


Revision: 61223
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61223
Author:   campbellbarton
Date:     2013-11-10 12:56:50 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
replace IS_EQ -> IS_EQF for use with floats.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/blenloader/intern/versioning_250.c
    trunk/blender/source/blender/editors/armature/pose_lib.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2013-11-10 12:39:15 UTC (rev 61222)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2013-11-10 12:56:50 UTC (rev 61223)
@@ -1567,11 +1567,11 @@
 	strip->blendout = fabsf(strip->blendout);
 	
 	/* result depends on where frame is in respect to blendin/out values */
-	if (IS_EQ(strip->blendin, 0) == 0 && (cframe <= (strip->start + strip->blendin))) {
+	if (IS_EQF(strip->blendin, 0.0f) == false && (cframe <= (strip->start + strip->blendin))) {
 		/* there is some blend-in */
 		return fabsf(cframe - strip->start) / (strip->blendin);
 	}
-	else if (IS_EQ(strip->blendout, 0) == 0 && (cframe >= (strip->end - strip->blendout))) {
+	else if (IS_EQF(strip->blendout, 0.0f) == false && (cframe >= (strip->end - strip->blendout))) {
 		/* there is some blend-out */
 		return fabsf(strip->end - cframe) / (strip->blendout);
 	}
@@ -1856,7 +1856,7 @@
 		inf *= nes->strip_time;
 	
 	/* optimisation: no need to try applying if there is no influence */
-	if (IS_EQ(inf, 0)) return;
+	if (IS_EQF(inf, 0.0f)) return;
 	
 	/* perform blending */
 	switch (blendmode) {

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2013-11-10 12:39:15 UTC (rev 61222)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2013-11-10 12:56:50 UTC (rev 61223)
@@ -285,7 +285,7 @@
 	 */
 	if (axis == 2) {
 		/* z-axis - vertical (top/bottom) */
-		if (IS_EQ(head, 0)) {
+		if (IS_EQF(head, 0.0f)) {
 			if (tail < 0)
 				strcpy(extension, "Bot");
 			else if (tail > 0)
@@ -300,7 +300,7 @@
 	}
 	else if (axis == 1) {
 		/* y-axis - depth (front/back) */
-		if (IS_EQ(head, 0)) {
+		if (IS_EQF(head, 0.0f)) {
 			if (tail < 0)
 				strcpy(extension, "Fr");
 			else if (tail > 0)
@@ -315,7 +315,7 @@
 	}
 	else {
 		/* x-axis - horizontal (left/right) */
-		if (IS_EQ(head, 0)) {
+		if (IS_EQF(head, 0.0f)) {
 			if (tail < 0)
 				strcpy(extension, "R");
 			else if (tail > 0)

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-11-10 12:39:15 UTC (rev 61222)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-11-10 12:56:50 UTC (rev 61223)
@@ -3075,7 +3075,7 @@
 				float offset;
 				
 				/* check to make sure len is not so close to zero that it'll cause errors */
-				if (IS_EQ(len, 0) == 0) {
+				if (IS_EQF(len, 0.0f) == false) {
 					/* find bounding-box range where target is located */
 					if (ownLoc[clamp_axis] < curveMin[clamp_axis]) {
 						/* bounding-box range is before */
@@ -3107,7 +3107,7 @@
 					curvetime = 0.0f;
 				else if (ownLoc[clamp_axis] >= curveMax[clamp_axis])
 					curvetime = 1.0f;
-				else if (IS_EQ((curveMax[clamp_axis] - curveMin[clamp_axis]), 0) == 0)
+				else if (IS_EQF((curveMax[clamp_axis] - curveMin[clamp_axis]), 0.0f) == false)
 					curvetime = (ownLoc[clamp_axis] - curveMin[clamp_axis]) / (curveMax[clamp_axis] - curveMin[clamp_axis]);
 				else 
 					curvetime = 0.0f;

Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c	2013-11-10 12:39:15 UTC (rev 61222)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c	2013-11-10 12:56:50 UTC (rev 61223)
@@ -2323,7 +2323,7 @@
 			KeyBlock *kb;
 
 			for (kb = key->block.first; kb; kb = kb->next) {
-				if (IS_EQF(kb->slidermin, kb->slidermax) && IS_EQ(kb->slidermax, 0))
+				if (IS_EQF(kb->slidermin, kb->slidermax) && IS_EQF(kb->slidermax, 0.0f))
 					kb->slidermax = kb->slidermin + 1.0f;
 			}
 		}

Modified: trunk/blender/source/blender/editors/armature/pose_lib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_lib.c	2013-11-10 12:39:15 UTC (rev 61222)
+++ trunk/blender/source/blender/editors/armature/pose_lib.c	2013-11-10 12:56:50 UTC (rev 61223)
@@ -567,7 +567,7 @@
 		if (fcu->bezt) {
 			for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 				/* check if remove */
-				if (IS_EQ(bezt->vec[1][0], marker->frame)) {
+				if (IS_EQF(bezt->vec[1][0], (float)marker->frame)) {
 					delete_fcurve_key(fcu, i, 1);
 					break;
 				}




More information about the Bf-blender-cvs mailing list