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:
authorRay Molenkamp <github@lazydodo.com>2022-01-06 00:02:07 +0300
committerRay Molenkamp <github@lazydodo.com>2022-01-06 00:02:07 +0300
commit7c013f1154e69094d911cdd6f756e832e4bb84fe (patch)
tree633bfb3849bebaec7c7381f73d14e2aa41b8ab31 /source/blender
parent611da3b7d6d62861f9a5e62d68a43cd560e8838c (diff)
Fix: MSVC build error
MSVC2017 and early 2019 versions are under the impression struct OGLRender is non trivial type due to the ThreadCondition field, not entirely sure why, but it is what it is. Differential Revision: https://developer.blender.org/D13742 Reviewed by: JacquesLucke
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/render/render_opengl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index 8d2e7e9b453..9b4f636431d 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -781,7 +781,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
}
/* allocate opengl render */
- oglrender = MEM_cnew<OGLRender>("OGLRender");
+ oglrender = MEM_new<OGLRender>("OGLRender");
op->customdata = oglrender;
oglrender->ofs = ofs;
@@ -960,7 +960,7 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
CTX_wm_area_set(C, oglrender->prevsa);
CTX_wm_region_set(C, oglrender->prevar);
- MEM_freeN(oglrender);
+ MEM_delete(oglrender);
}
static void screen_opengl_render_cancel(bContext *C, wmOperator *op)