diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-26 12:57:30 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-26 13:58:53 +0400 |
| commit | 74518b28267e9b18199212fbaa3c689fa018d20c (patch) | |
| tree | 71a4ea9f274f4a4301c48060984df0802af46c78 /intern/cycles/device/device_multi.cpp | |
| parent | 3b0832dd869b4c27f0b976e36134332cf427430c (diff) | |
Fix T39420: Cycles viewport/preview flickers, when moving mouse across editors
Issue was caused by the wrong usage of OCIO GLSL binding API. To make it
work properly on pre-GLSL-1.3 drivers shader is to be enabled after the
texture is binded to the opengl context. Otherwise it wouldn't know the
proper texture size.
This is actually a regression in 2.70 and to be ported to 'a'.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 1e9367c845a..59bbf3b9d5a 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -233,7 +233,8 @@ public: mem.device_pointer = tmp; } - void draw_pixels(device_memory& rgba, int y, int w, int h, int dy, int width, int height, bool transparent) + void draw_pixels(device_memory& rgba, int y, int w, int h, int dy, int width, int height, bool transparent, + const DeviceDrawParams &draw_params) { device_ptr tmp = rgba.device_pointer; int i = 0, sub_h = h/devices.size(); @@ -247,7 +248,7 @@ public: /* adjust math for w/width */ rgba.device_pointer = sub.ptr_map[tmp]; - sub.device->draw_pixels(rgba, sy, w, sh, sdy, width, sheight, transparent); + sub.device->draw_pixels(rgba, sy, w, sh, sdy, width, sheight, transparent, draw_params); i++; } |