From 2329cc09e6aec1adf09db755b0912a79cb3ab63a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 28 Feb 2018 02:29:55 +0100 Subject: Code cleanup: make viewport free simpler and consistent with GPU module. --- source/blender/gpu/intern/gpu_viewport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/gpu/intern/gpu_viewport.c') diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index 83b9a8f0b0e..ee9d175e217 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -410,7 +410,6 @@ void GPU_viewport_bind(GPUViewport *viewport, const rcti *rect) cleanup_multisample: if (!ok) { GPU_viewport_free(viewport); - MEM_freeN(viewport); return; } } @@ -466,7 +465,6 @@ cleanup_multisample: cleanup: if (!ok) { GPU_viewport_free(viewport); - MEM_freeN(viewport); DRW_opengl_context_disable(); return; } @@ -622,6 +620,8 @@ void GPU_viewport_free(GPUViewport *viewport) MEM_freeN(viewport->idatalist); GPU_viewport_debug_depth_free(viewport); + + MEM_freeN(viewport); } /****************** debug ********************/ -- cgit v1.2.3