Commit: 8b4da9a191b9a35c743209d38c99c000f8490501
Author: Sergey Sharybin
Date:   Fri Feb 18 10:14:34 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB8b4da9a191b9a35c743209d38c99c000f8490501

Fix strict compilation warnings

===================================================================

M       intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc
M       source/blender/draw/intern/draw_cache_impl_subdivision.cc

===================================================================

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()
diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc 
b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
index 60c07db90b7..e8ff9a508a2 100644
--- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc
+++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
@@ -1818,9 +1818,9 @@ static bool draw_subdiv_create_requested_buffers(const 
Scene *scene,
                                                  const float obmat[4][4],
                                                  const bool do_final,
                                                  const bool do_uvedit,
-                                                 const bool use_subsurf_fdots,
+                                                 const bool 
/*use_subsurf_fdots*/,
                                                  const ToolSettings *ts,
-                                                 const bool use_hide,
+                                                 const bool /*use_hide*/,
                                                  OpenSubdiv_EvaluatorCache 
*evaluator_cache)
 {
   SubsurfModifierData *smd = BKE_object_get_last_subsurf_modifier(ob);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to