fix for drawing non 1:1 aspect masks, transform and selection still need support.

diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index 88667729eee7ca4d8e9d5e971eb51e08f2ac467b..8ebf932fd966ed0c9d5741d57129ba2babe5b374 100644 (file)
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -56,7 +56,8 @@ void ED_operatormacros_mask(void);
 void ED_mask_draw(const bContext *C, const char draw_flag, const char draw_type);
 void ED_mask_draw_region(struct Mask *mask, struct ARegion *ar,
                          const char draw_flag, const char draw_type,
 void ED_mask_draw(const bContext *C, const char draw_flag, const char draw_type);
 void ED_mask_draw_region(struct Mask *mask, struct ARegion *ar,
                          const char draw_flag, const char draw_type,

-                         int width, int height,
+                         const int width_i, const int height_i,
+                         const float aspx, const float aspy,

                          const short do_scale_applied, const short do_post_draw,
                          float stabmat[4][4],
                          const bContext *C);
                          const short do_scale_applied, const short do_post_draw,
                          float stabmat[4][4],
                          const bContext *C);

diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 00bbfcf3188b6d01ec786bd98671d1855dcb8dec..655458bd4cb3caa17893cd78707538cedc648b16 100644 (file)
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -496,7 +496,8 @@ void ED_mask_draw(const bContext *C,
  * width, height are to match the values from ED_mask_get_size() */
 void ED_mask_draw_region(Mask *mask, ARegion *ar,
                          const char draw_flag, const char draw_type,
  * width, height are to match the values from ED_mask_get_size() */
 void ED_mask_draw_region(Mask *mask, ARegion *ar,
                          const char draw_flag, const char draw_type,

-                         int width, int height,
+                         const int width_i, const int height_i,  /* convert directly into aspect corrected vars */
+                         const float aspx, const float aspy,

                          const short do_scale_applied, const short do_post_draw,
                          float stabmat[4][4], /* optional - only used by clip */
                          const bContext *C    /* optional - only used when do_post_draw is set */
                          const short do_scale_applied, const short do_post_draw,
                          float stabmat[4][4], /* optional - only used by clip */
                          const bContext *C    /* optional - only used when do_post_draw is set */


@@ -504,6 +505,9 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar,
 {
        struct View2D *v2d = &ar->v2d;
 
 {
        struct View2D *v2d = &ar->v2d;
 

+       /* aspect always scales vertically in movie and image spaces */
+       const float width = width_i, height = (float)height_i * (aspy / aspx);
+

        int x, y;
        /* int w, h; */
        float zoomx, zoomy;
        int x, y;
        /* int w, h; */
        float zoomx, zoomy;

diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index bb06104d4422b3928ba7742295ae0747032a071c..7f43c404095e789c1f45d9363c1d234e665c0720 100644 (file)
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1131,10 +1131,13 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
                if (mask) {
                        ScrArea *sa = CTX_wm_area(C);
                        int width, height;
                if (mask) {
                        ScrArea *sa = CTX_wm_area(C);
                        int width, height;

+                       float aspx, aspy;

                        ED_mask_get_size(sa, &width, &height);
                        ED_mask_get_size(sa, &width, &height);

+                       ED_space_clip_get_aspect(sc, &aspx, &aspy);

                        ED_mask_draw_region(mask, ar,
                                            sc->mask_info.draw_flag, sc->mask_info.draw_type,
                                            width, height,
                        ED_mask_draw_region(mask, ar,
                                            sc->mask_info.draw_flag, sc->mask_info.draw_type,
                                            width, height,

+                                           aspx, aspy,

                                            TRUE, TRUE,
                                            sc->stabmat, C);
                }
                                            TRUE, TRUE,
                                            sc->stabmat, C);
                }

diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 9cceaf0aa8e715f24afa1fe5a2f4c05cb0b50c59..91a0cba255585642bbbee8af4b40c147dd9885a2 100644 (file)
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -682,10 +682,13 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 
        if (mask) {
                int width, height;
 
        if (mask) {
                int width, height;

+               float aspx, aspy;

                ED_space_image_get_size(sima, &width, &height);
                ED_space_image_get_size(sima, &width, &height);

+               ED_space_image_get_aspect(sima, &aspx, &aspy);

                ED_mask_draw_region(mask, ar,
                                    sima->mask_info.draw_flag, sima->mask_info.draw_type,
                                    width, height,
                ED_mask_draw_region(mask, ar,
                                    sima->mask_info.draw_flag, sima->mask_info.draw_type,
                                    width, height,

+                                   aspx, aspy,

                                    TRUE, FALSE,
                                    NULL, C);
 
                                    TRUE, FALSE,
                                    NULL, C);
 

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index ddb681236b6ec3808907e9b1c8a9ee82b5bc7d5f..0c316450c29728387ae12d515e3b2d31cd70741e 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1049,6 +1049,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 
                if (mask) {
                        int width, height;
 
                if (mask) {
                        int width, height;

+                       float aspx = 1.0f, aspy = 1.0f;

                        // ED_mask_get_size(C, &width, &height);
 
                        //Scene *scene = CTX_data_scene(C);
                        // ED_mask_get_size(C, &width, &height);
 
                        //Scene *scene = CTX_data_scene(C);


@@ -1058,6 +1059,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
                        ED_mask_draw_region(mask, ar,
                                            0, 0,  /* TODO */
                                            width, height,
                        ED_mask_draw_region(mask, ar,
                                            0, 0,  /* TODO */
                                            width, height,

+                                           aspx, aspy,

                                            FALSE, TRUE,
                                            NULL, C);
                }
                                            FALSE, TRUE,
                                            NULL, C);
                }