diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-28 13:07:10 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-28 13:07:10 +0400 |
commit | 33740c5eb56884929b70a394e5b3dc7ceb0cfc91 (patch) | |
tree | 9c70fcb068f0514a4fccaaf399e0606f8f4119b5 /intern | |
parent | 30d128c7a723bb6ed68c763d175c845e1cfa3c4f (diff) |
Cycles: viewport rendered draw mode now shows background images, also changed the
image editor checkerboard pattern to be the same as cycles viewport.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/buffers.cpp | 28 | ||||
-rw-r--r-- | intern/cycles/render/buffers.h | 1 |
2 files changed, 1 insertions, 28 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index dd0ebf7195c..c8d5dd2da8d 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -250,36 +250,10 @@ void DisplayBuffer::draw_set(int width, int height) draw_height = height; } -void DisplayBuffer::draw_transparency_grid() -{ - GLubyte checker_stipple_sml[32*32/8] = { - 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \ - 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \ - 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \ - 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \ - 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \ - 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \ - 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \ - 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \ - }; - - glColor4ub(50, 50, 50, 255); - glRectf(0, 0, params.width, params.height); - glEnable(GL_POLYGON_STIPPLE); - glColor4ub(55, 55, 55, 255); - glPolygonStipple(checker_stipple_sml); - glRectf(0, 0, params.width, params.height); - glDisable(GL_POLYGON_STIPPLE); -} - void DisplayBuffer::draw(Device *device) { - if(draw_width != 0 && draw_height != 0) { - if(transparent) - draw_transparency_grid(); - + if(draw_width != 0 && draw_height != 0) device->draw_pixels(rgba, 0, draw_width, draw_height, 0, params.width, params.height, transparent); - } } bool DisplayBuffer::draw_ready() diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h index 3062e5ae3e4..77ad4a5a4b0 100644 --- a/intern/cycles/render/buffers.h +++ b/intern/cycles/render/buffers.h @@ -119,7 +119,6 @@ public: bool draw_ready(); protected: - void draw_transparency_grid(); void device_free(); Device *device; |