diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 21:21:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 21:21:10 +0300 |
| commit | bdfc10e482c4c6724a45259c4b2f2d7cde7d26d0 (patch) | |
| tree | eb760d90e014ab274b9d31be3a7696f80a742786 /intern/cycles/device/device_cuda.cpp | |
| parent | 88e45b8c99c640506b88a7529b504378a2b51f32 (diff) | |
Fix T59349: Cycles viewport render flickering when changing some settings.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index a788a8627d8..67f5793e793 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1861,6 +1861,7 @@ public: glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + glActiveTexture(GL_TEXTURE0); glGenTextures(1, &pmem.cuTexId); glBindTexture(GL_TEXTURE_2D, pmem.cuTexId); if(mem.data_type == TYPE_HALF) @@ -1949,6 +1950,7 @@ public: offset *= sizeof(uint8_t); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pmem.cuPBO); + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, pmem.cuTexId); if(mem.data_type == TYPE_HALF) { glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_HALF_FLOAT, (void*)offset); |