2.5: Image Editor

[blender-staging.git] / source / blender / editors / space_image / space_image.c

diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 49f950fe67b8ebee18cb4680ab0e45e4c2cfdca1..7d6faa00dfc4e825b4a754182c76d78716e31a9c 100644 (file)
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -327,12 +327,10 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *sce
 #endif
        if(sima->image) {
                ImBuf *ibuf= ED_space_image_buffer(sima);
-               float xuser_asp, yuser_asp;
                
-               ED_image_aspect(sima->image, &xuser_asp, &yuser_asp);
                if(ibuf) {
-                       width= ibuf->x*xuser_asp;
-                       height= ibuf->y*yuser_asp;
+                       width= ibuf->x;
+                       height= ibuf->y;
                }
                else if(sima->image->type==IMA_TYPE_R_RESULT) {
                        /* not very important, just nice */
@@ -683,7 +681,7 @@ void ED_image_aspect(Image *ima, float *aspx, float *aspy)
        *aspx= *aspy= 1.0;
 
        if((ima == NULL) || (ima->type == IMA_TYPE_R_RESULT) || (ima->type == IMA_TYPE_COMPOSITE) ||
-          (ima->tpageflag & IMA_TILES) || (ima->aspx==0.0 || ima->aspy==0.0))
+          (ima->aspx==0.0 || ima->aspy==0.0))
                return;
 
        /* x is always 1 */