fix a bug and storing a bool as a float
authorCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 18:55:34 +0000 (18:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 18:55:34 +0000 (18:55 +0000)
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c

index 0b23bbc1b55d03bcd24872e4e31d82b88bb4ba38..296da01a73e3fdf0e872b9b5979feb71590a62f1 100644 (file)
@@ -237,7 +237,7 @@ void projectIntView(TransInfo *t, const float vec[3], int adr[2])
 
                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;
index ee649888259135ca163740d767060e4a73352531..fa6dedc59901fcd1921f8bdc54eaf5c1dee07d26 100644 (file)
@@ -5824,7 +5824,7 @@ void flushTransTracking(TransInfo *t)
 /* * masking * */
 
 typedef struct TransDataMasking{
-       float is_handle;
+       int   is_handle;
 
        float handle[2], orig_handle[2];
        float vec[3][3];