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:
authorClément <clement@Clements-MacBook-Pro.local>2020-09-08 16:49:16 +0300
committerClément <clement@Clements-MacBook-Pro.local>2020-09-08 16:49:16 +0300
commitacdea4e98bc7a909558a4f7efacf11a0b6d8e147 (patch)
treeecb2a2e4357747ad38a38e73126d5409694c22fc
parent2af70acc3a66d49cf048e44ade55bdd71c65ed3c (diff)
GLFrameBuffer: Fix mass renaming issue
The context might be partialy freed, so use gpu::Context instead of GLcontext.
-rw-r--r--source/blender/gpu/opengl/gl_framebuffer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc
index 85fa973daff..14b7d78c2ff 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.cc
+++ b/source/blender/gpu/opengl/gl_framebuffer.cc
@@ -78,8 +78,8 @@ GLFrameBuffer::~GLFrameBuffer()
return;
}
- if (context_ == GLContext::get()) {
- /* Context might be partially freed. This happens when destroying the window frame-buffers. */
+ /* Context might be partially freed. This happens when destroying the window frame-buffers. */
+ if (context_ == Context::get()) {
glDeleteFramebuffers(1, &fbo_id_);
}
else {
@@ -89,7 +89,7 @@ GLFrameBuffer::~GLFrameBuffer()
if (context_->active_fb == this && context_->back_left != this) {
/* If this assert triggers it means the frame-buffer is being freed while in use by another
* context which, by the way, is TOTALLY UNSAFE!!! */
- BLI_assert(context_ == GLContext::get());
+ BLI_assert(context_ == Context::get());
GPU_framebuffer_restore();
}
}