[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46745] branches/soc-2011-tomato/source/ blender/editors/transform: fix a bug and storing a bool as a float

[Campbell Barton]

Revision: 46745
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46745
Author:   campbellbarton
Date:     2012-05-17 18:55:34 +0000 (Thu, 17 May 2012)
Log Message:
-----------
fix a bug and storing a bool as a float

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.c	2012-05-17 17:16:51 UTC (rev 46744)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.c	2012-05-17 18:55:34 UTC (rev 46745)
@@ -237,7 +237,7 @@
 
 		copy_v2_v2(v, vec);
 
-		if (t->options & CTX_MASK) {
+		if (t->options & CTX_MOVIECLIP) {
 			float aspx, aspy;
 			ED_space_clip_aspect(t->sa->spacedata.first, &aspx, &aspy);
 			v[0] /= aspx;

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-05-17 17:16:51 UTC (rev 46744)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-05-17 18:55:34 UTC (rev 46745)
@@ -5824,7 +5824,7 @@
 /* * masking * */
 
 typedef struct TransDataMasking{
-	float is_handle;
+	int   is_handle;
 
 	float handle[2], orig_handle[2];
 	float vec[3][3];