blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Bastien Montagne 2022-02-18 14:55:54 +01:00
parent 5f16e24cc9 02f4d63dcc
commit af308049bc
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/opensubdiv/internal/evaluator/gl_compute_evaluator.cc
View File

@ -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()

15
source/blender/blenloader/intern/blend_validate.c
View File

@ -181,5 +181,20 @@ bool BLO_main_validate_shapekeys(Main *bmain, ReportList *reports)
BKE_main_unlock(bmain);
/* NOTE: #BKE_id_delete also locks `bmain`, so we need to do this loop outside of the lock here.
*/
LISTBASE_FOREACH_MUTABLE (Key *, shapekey, &bmain->shapekeys) {
if (shapekey->from != NULL) {
continue;
}
BKE_reportf(reports,
RPT_ERROR,
"Shapekey %s has an invalid 'from' pointer (%p), it will be deleted",
shapekey->id.name,
shapekey->from);
BKE_id_delete(bmain, shapekey);
}
return is_valid;
}

4
source/blender/draw/intern/draw_cache_impl_subdivision.cc
View File

@ -1803,9 +1803,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 UNUSED(use_subsurf_fdots),
const bool /*use_subsurf_fdots*/,
const ToolSettings *ts,
const bool UNUSED(use_hide),
const bool /*use_hide*/,
OpenSubdiv_EvaluatorCache *evaluator_cache)
{
SubsurfModifierData *smd = BKE_object_get_last_subsurf_modifier(ob);