Revision: 28384
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28384
Author:   blendix
Date:     2010-04-23 17:53:29 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
Render Branch: Take border render into account when drawing grid
before for render result becomes visible.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_image/space_image.c

Modified: branches/render25/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/render25/source/blender/editors/space_image/space_image.c  
2010-04-23 12:15:50 UTC (rev 28383)
+++ branches/render25/source/blender/editors/space_image/space_image.c  
2010-04-23 15:53:29 UTC (rev 28384)
@@ -178,6 +178,12 @@
                /* 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));


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to