[Bf-blender-cvs] [d6a9783b71e] master: Cleanup: GLFrameBuffer: Reduce indentation
Clément Foucault
noreply at git.blender.org
Tue Sep 1 18:43:00 CEST 2020
Commit: d6a9783b71ea1749a071d57400692717f6935de3
Author: Clément Foucault
Date: Tue Sep 1 18:41:23 2020 +0200
Branches: master
https://developer.blender.org/rBd6a9783b71ea1749a071d57400692717f6935de3
Cleanup: GLFrameBuffer: Reduce indentation
===================================================================
M source/blender/gpu/opengl/gl_framebuffer.cc
===================================================================
diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc
index c97f4e2a270..8d48c9f8de3 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.cc
+++ b/source/blender/gpu/opengl/gl_framebuffer.cc
@@ -74,21 +74,23 @@ GLFrameBuffer::GLFrameBuffer(
GLFrameBuffer::~GLFrameBuffer()
{
- if (context_ != NULL) {
- if (context_ == GPU_context_active_get()) {
- /* Context might be partially freed. This happens when destroying the window framebuffers. */
- glDeleteFramebuffers(1, &fbo_id_);
- }
- else {
- context_->fbo_free(fbo_id_);
- }
- /* Restore default framebuffer if this framebuffer was bound. */
- if (context_->active_fb == this && context_->back_left != this) {
- /* If this assert triggers it means the framebuffer is being freed while in use by another
- * context which, by the way, is TOTALLY UNSAFE!!! */
- BLI_assert(context_ == GPU_context_active_get());
- GPU_framebuffer_restore();
- }
+ if (context_ == NULL) {
+ return;
+ }
+
+ if (context_ == GPU_context_active_get()) {
+ /* Context might be partially freed. This happens when destroying the window framebuffers. */
+ glDeleteFramebuffers(1, &fbo_id_);
+ }
+ else {
+ context_->fbo_free(fbo_id_);
+ }
+ /* Restore default framebuffer if this framebuffer was bound. */
+ if (context_->active_fb == this && context_->back_left != this) {
+ /* If this assert triggers it means the framebuffer is being freed while in use by another
+ * context which, by the way, is TOTALLY UNSAFE!!! */
+ BLI_assert(context_ == GPU_context_active_get());
+ GPU_framebuffer_restore();
}
}
More information about the Bf-blender-cvs
mailing list