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 Foucault <foucault.clem@gmail.com>2020-08-31 16:13:26 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-31 16:13:26 +0300
commit1b3a0ae2316063d9817210a8fe5fd4588cee47cf (patch)
treec655cf72bc5d049b0c321c45043df34c0db054b6
parenta54fb081ba92c51a7fc5dc9d3b0d51df709395de (diff)
GLContext: Fix framebuffer deletion to GPUContext
This has more meaning as it's the base class who holds the pointer. # Conflicts: # source/blender/gpu/opengl/gl_context.cc
-rw-r--r--source/blender/gpu/intern/gpu_context.cc4
-rw-r--r--source/blender/gpu/opengl/gl_context.cc5
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc
index 6101ac5a0d2..f188f5e9fda 100644
--- a/source/blender/gpu/intern/gpu_context.cc
+++ b/source/blender/gpu/intern/gpu_context.cc
@@ -71,6 +71,10 @@ GPUContext::~GPUContext()
{
GPU_matrix_state_discard(matrix_state);
delete state_manager;
+ delete front_left;
+ delete back_left;
+ delete front_right;
+ delete back_right;
}
bool GPUContext::is_active_on_thread(void)
diff --git a/source/blender/gpu/opengl/gl_context.cc b/source/blender/gpu/opengl/gl_context.cc
index 255436d1ba9..6bfbac72301 100644
--- a/source/blender/gpu/opengl/gl_context.cc
+++ b/source/blender/gpu/opengl/gl_context.cc
@@ -101,11 +101,6 @@ GLContext::~GLContext()
}
glDeleteVertexArrays(1, &default_vao_);
glDeleteBuffers(1, &default_attr_vbo_);
-
- delete front_left;
- delete back_left;
- delete front_right;
- delete back_right;
}
/** \} */