diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-02-18 16:55:54 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-02-18 16:55:54 +0300 |
| commit | af308049bc6d07e89ccf1e942a3a934453688be8 (patch) | |
| tree | b92d213c8dc618a5b1743c5c6a47775a768ab689 /intern/opensubdiv | |
| parent | 5f16e24cc9ac4f620df2ab65d5a7b9ae4f99f203 (diff) | |
| parent | 02f4d63dcc7b74fbacfb4e5bcdd01766563573f5 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern/opensubdiv')
| -rw-r--r-- | intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc index ee4eaeaec5d..acf628c7035 100644 --- a/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc +++ b/intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc @@ -140,8 +140,8 @@ GLStencilTableSSBO::~GLStencilTableSSBO() GLComputeEvaluator::GLComputeEvaluator() : _workGroupSize(64), _patchArraysSSBO(0) { - memset(&_stencilKernel, 0, sizeof(_stencilKernel)); - memset(&_patchKernel, 0, sizeof(_patchKernel)); + memset((void *)&_stencilKernel, 0, sizeof(_stencilKernel)); + memset((void *)&_patchKernel, 0, sizeof(_patchKernel)); } GLComputeEvaluator::~GLComputeEvaluator() |