[Bf-blender-cvs] [7c013f1154e] master: Fix: MSVC build error
Ray Molenkamp
noreply at git.blender.org
Wed Jan 5 22:02:13 CET 2022
Commit: 7c013f1154e69094d911cdd6f756e832e4bb84fe
Author: Ray Molenkamp
Date: Wed Jan 5 14:02:07 2022 -0700
Branches: master
https://developer.blender.org/rB7c013f1154e69094d911cdd6f756e832e4bb84fe
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
===================================================================
M source/blender/editors/render/render_opengl.cc
===================================================================
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)
More information about the Bf-blender-cvs
mailing list