[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13593] trunk/blender/source/blender/src:

[Brecht Van Lommel]

Revision: 13593
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13593
Author:   blendix
Date:     2008-02-06 18:43:32 +0100 (Wed, 06 Feb 2008)

Log Message:
-----------

Mouse-click in the ipo/action/timeline/.. to change the frame
used to round down, and select the previous frame even when
the mouse was very close to the next one. Now it snaps to the
closest frame instead.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editaction.c
    trunk/blender/source/blender/src/editnla.c
    trunk/blender/source/blender/src/editsound.c
    trunk/blender/source/blender/src/edittime.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c	2008-02-06 17:29:16 UTC (rev 13592)
+++ trunk/blender/source/blender/src/editaction.c	2008-02-06 17:43:32 UTC (rev 13593)
@@ -4272,7 +4272,7 @@
 					getmouseco_areawin(mval);
 					areamouseco_to_ipoco(G.v2d, mval, &dx, &dy);
 					
-					cfra= (int)dx;
+					cfra= (int)(dx+0.5f);
 					if (cfra < 1) cfra= 1;
 					
 					if (cfra != CFRA) {

Modified: trunk/blender/source/blender/src/editnla.c
===================================================================
--- trunk/blender/source/blender/src/editnla.c	2008-02-06 17:29:16 UTC (rev 13592)
+++ trunk/blender/source/blender/src/editnla.c	2008-02-06 17:43:32 UTC (rev 13593)
@@ -1936,7 +1936,7 @@
 						
 						areamouseco_to_ipoco(G.v2d, mval, &dx, &dy);
 						
-						cfra= (int)dx;
+						cfra= (int)(dx+0.5f);
 						if(cfra< 1) cfra= 1;
 						
 						if( cfra!=CFRA ) {

Modified: trunk/blender/source/blender/src/editsound.c
===================================================================
--- trunk/blender/source/blender/src/editsound.c	2008-02-06 17:29:16 UTC (rev 13592)
+++ trunk/blender/source/blender/src/editsound.c	2008-02-06 17:43:32 UTC (rev 13593)
@@ -143,7 +143,7 @@
 				getmouseco_areawin(mval);
 				areamouseco_to_ipoco(G.v2d, mval, &dx, &dy);
 				
-				cfra = (int)dx;
+				cfra = (int)(dx+0.5f);
 				if(cfra< 1) cfra= 1;
 				
 				if( cfra!=CFRA || first )

Modified: trunk/blender/source/blender/src/edittime.c
===================================================================
--- trunk/blender/source/blender/src/edittime.c	2008-02-06 17:29:16 UTC (rev 13592)
+++ trunk/blender/source/blender/src/edittime.c	2008-02-06 17:43:32 UTC (rev 13593)
@@ -856,7 +856,7 @@
 				getmouseco_areawin(mval);
 				areamouseco_to_ipoco(G.v2d, mval, &dx, &dy);
 				
-				cfra = (int)dx;
+				cfra = (int)(dx+0.5f);
 				if(cfra< MINFRAME) cfra= MINFRAME;
 				
 				if( cfra!=CFRA || first )

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-02-06 17:29:16 UTC (rev 13592)
+++ trunk/blender/source/blender/src/space.c	2008-02-06 17:43:32 UTC (rev 13593)
@@ -2837,7 +2837,7 @@
 					getmouseco_areawin(mval);
 					areamouseco_to_ipoco(v2d, mval, &dx, &dy);
 					
-					cfra = get_cfra_from_dx(sipo, (int)dx);
+					cfra = get_cfra_from_dx(sipo, (int)(dx+0.5f));
 					if(cfra< 1) cfra= 1;
 					
 					if( cfra!=CFRA ) {
@@ -4644,7 +4644,7 @@
 					getmouseco_areawin(mval);
 					areamouseco_to_ipoco(v2d, mval, &dx, &dy);
 					
-					cfra= (int)dx;
+					cfra= (int)(dx+0.5f);
 					if(cfra< 1) cfra= 1;
 					/* else if(cfra> EFRA) cfra= EFRA; */