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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-28 04:29:55 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-28 05:04:15 +0300
commit2329cc09e6aec1adf09db755b0912a79cb3ab63a (patch)
tree2b6e98bf49686df94d61351802a33e4e9ab44c2c /source/blender/gpu/intern/gpu_viewport.c
parentbe5e437bb5ffcc9d29d9f665d6a13661700a6055 (diff)
Code cleanup: make viewport free simpler and consistent with GPU module.
Diffstat (limited to 'source/blender/gpu/intern/gpu_viewport.c')
-rw-r--r--source/blender/gpu/intern/gpu_viewport.c4
1 files changed, 2 insertions, 2 deletions
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 ********************/