Commit: 1b3a0ae2316063d9817210a8fe5fd4588cee47cf Author: Clément Foucault Date: Mon Aug 31 15:13:26 2020 +0200 Branches: master https://developer.blender.org/rB1b3a0ae2316063d9817210a8fe5fd4588cee47cf
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 =================================================================== M source/blender/gpu/intern/gpu_context.cc M source/blender/gpu/opengl/gl_context.cc =================================================================== 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; } /** \} */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs