diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-27 05:18:54 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-27 05:18:54 +0400 |
| commit | ff7c690e4064bbb1d6180668625d7b414000e9ea (patch) | |
| tree | 4ac96ca8ed5a4e6a7ab1104d0271aba02266ace6 /source/blender/editors/space_clip/space_clip.c | |
| parent | 6b65102c20e9bdafd90f55f60c2a2084d873e809 (diff) | |
| parent | 9b32776be349f5e738b449ca1298e65ce1b69d33 (diff) | |
Merge w/ trunk: r52086-r52534 (As with last time, the game engine was not merged)soc-2012-swiss_cheese
Diffstat (limited to 'source/blender/editors/space_clip/space_clip.c')
| -rw-r--r-- | source/blender/editors/space_clip/space_clip.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 1620ea9cb1f..5f0e4db9dd7 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -1030,17 +1030,14 @@ static void clip_refresh(const bContext *C, ScrArea *sa) static void movieclip_main_area_set_view2d(const bContext *C, ARegion *ar) { SpaceClip *sc = CTX_wm_space_clip(C); - MovieClip *clip = ED_space_clip_get_clip(sc); - float x1, y1, w, h; + float x1, y1, w, h, aspx, aspy; int width, height, winx, winy; ED_space_clip_get_size(sc, &width, &height); + ED_space_clip_get_aspect(sc, &aspx, &aspy); - w = width; - h = height; - - if (clip) - h *= clip->aspy / clip->aspx / clip->tracking.camera.pixel_aspect; + w = width * aspx; + h = height * aspy; winx = BLI_rcti_size_x(&ar->winrct) + 1; winy = BLI_rcti_size_y(&ar->winrct) + 1; |