diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-18 00:07:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-18 00:07:01 +0300 |
| commit | 94e583b476600f13a490af448162ce390422025f (patch) | |
| tree | eb59b9e205fd0a313ba90980ea847a444a1dd66f /source/blender/editors/space_image/space_image.c | |
| parent | ec8c8f08ba8a216d27962eff275a09034c69aa83 (diff) | |
RNA:
* Added Particle wrapping patch by Roelf de Kock. It's not
complete yet and I haven't reviewed it, but committing anyway,
will get to it later.
* Added "Percentage" subtype for floats. Doesn't really do
much besides making auto rna buttons into sliders rather than
numeric inputs, but can later display in % rather than 0.0-1.0.
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 934cf586b9f..b088f5920ed 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -282,8 +282,6 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *sce float x1, y1, w, h; int width, height, winx, winy; - ED_space_image_size(sima, &width, &height); - #if 0 if(image_preview_active(curarea, &width, &height)); #endif @@ -293,15 +291,19 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *sce ED_image_aspect(sima->image, &xuser_asp, &yuser_asp); if(ibuf) { - width= ibuf->x * xuser_asp; - width= ibuf->y * yuser_asp; + width= ibuf->x*xuser_asp; + height= ibuf->y*yuser_asp; } - else if( sima->image->type==IMA_TYPE_R_RESULT ) { + else if(sima->image->type==IMA_TYPE_R_RESULT) { /* not very important, just nice */ width= (scene->r.xsch*scene->r.size)/100; height= (scene->r.ysch*scene->r.size)/100; } + else + ED_space_image_size(sima, &width, &height); } + else + ED_space_image_size(sima, &width, &height); w= width; h= height; |