Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-11-18 08:08:35 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-11-24 02:12:48 +0300
commitd992240bfafd749a6535cc3abf0815567f8a3af7 (patch)
treea35bb8feec789e520dead65cbdf864c3df746ec4 /intern/cycles/device/device.cpp
parenta786baa193d28e2193a9f2953b61e659c7df92e0 (diff)
Fix unneeded legacy OpenGL call in Cycles viewport drawing.
Diffstat (limited to 'intern/cycles/device/device.cpp')
-rw-r--r--intern/cycles/device/device.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 0364f809f8c..d6f5c5af428 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -260,8 +260,6 @@ void Device::draw_pixels(
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glEnable(GL_TEXTURE_2D);
-
if(transparent) {
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -345,7 +343,6 @@ void Device::draw_pixels(
}
glBindTexture(GL_TEXTURE_2D, 0);
- glDisable(GL_TEXTURE_2D);
glDeleteTextures(1, &texid);
if(transparent) {