[Bf-blender-cvs] [d73e3f7] master: Revert "Fix T42222"

Campbell Barton noreply at git.blender.org
Wed Oct 29 11:11:49 CET 2014


Commit: d73e3f71d4cd5975c82f61d57494aa56a0760c29
Author: Campbell Barton
Date:   Wed Oct 29 11:10:07 2014 +0100
Branches: master
https://developer.blender.org/rBd73e3f71d4cd5975c82f61d57494aa56a0760c29

Revert "Fix T42222"

This reverts commit 507712db3fd7aa7bb903f6860f5a4eb29aa2be02.

Error was quite an old compiler, which had further warnings/errors.

Old compilers can just have this defined in BLI_math

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

M	source/blender/editors/interface/view2d_ops.c

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

diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index a396893..2b84c06 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -1726,7 +1726,7 @@ static void scroller_activate_apply(bContext *C, wmOperator *op)
 	temp = vsm->fac * vsm->delta;
 
 	/* round to pixel */
-	temp = floorf(temp / vsm->fac_round + 0.5f) * vsm->fac_round;
+	temp = roundf(temp / vsm->fac_round) * vsm->fac_round;
 	
 	/* type of movement */
 	switch (vsm->zone) {




More information about the Bf-blender-cvs mailing list