diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-23 22:02:50 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-23 22:02:50 +0400 |
| commit | 23ad9588ad21c153cfc4427bc0189285b64411b2 (patch) | |
| tree | 1f65d6a6015383ccf50cc75d9586ad815435c6a1 /source/blender/editors/space_image/space_image.c | |
| parent | 877e855ca51a015bc363f317d7a5f4c6c372275b (diff) | |
Some fixes from the render branch:
* Take border render into account when drawing grid before for render
result becomes visible.
* Use antialiasing for rendering icon previews.
* Fix Full Sample not drawing render result while rendering.
* Mesh Deform Modifier: also forgot to commit this file.
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 45903c8079d..af35fa4f5a9 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -178,6 +178,12 @@ void ED_space_image_size(SpaceImage *sima, int *width, int *height) /* not very important, just nice */ *width= (scene->r.xsch*scene->r.size)/100; *height= (scene->r.ysch*scene->r.size)/100; + + if((scene->r.mode & R_BORDER) && (scene->r.mode & R_CROP)) { + *width *= (scene->r.border.xmax - scene->r.border.xmin); + *height *= (scene->r.border.ymax - scene->r.border.ymin); + } + } /* I know a bit weak... but preview uses not actual image size */ // XXX else if(image_preview_active(sima, width, height)); |