Merging r49212 through r49222 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_image / space_image.c
index 721809926cbe0b694d3121b3610d3c6e88eae4dc..a7f8fade9ea82ccacc789e6ad52d2dbde13096e6 100644 (file)
@@ -512,7 +512,7 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar)
        if (image_preview_active(curarea, &width, &height)) ;
        else
 #endif
-       ED_space_image_size(sima, &width, &height);
+       ED_space_image_get_size(sima, &width, &height);
 
        w = width;
        h = height;