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

Cleanup: Resolve unused variable warnings in modifier

This commit is contained in:
Hans Goudey 2022-12-09 13:51:52 -06:00
parent bcbd13201a
commit b000fc308b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/modifiers/intern/MOD_meshsequencecache.cc
View File

@ -106,6 +106,8 @@ static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*
return (mcmd->cache_file == nullptr) || (mcmd->object_path[0] == '\0');
}
#if defined(WITH_USD) || defined(WITH_ALEMBIC)
/* Return true if the modifier evaluation is for the ORCO mesh and the mesh hasn't changed
* topology.
*/
@ -123,18 +125,18 @@ static bool can_use_mesh_for_orco_evaluation(MeshSeqCacheModifierData *mcmd,
switch (cache_file->type) {
case CACHEFILE_TYPE_ALEMBIC:
#ifdef WITH_ALEMBIC
# ifdef WITH_ALEMBIC
if (!ABC_mesh_topology_changed(mcmd->reader, ctx->object, mesh, time, err_str)) {
return true;
}
#endif
# endif
break;
case CACHEFILE_TYPE_USD:
#ifdef WITH_USD
# ifdef WITH_USD
if (!USD_mesh_topology_changed(mcmd->reader, ctx->object, mesh, time, err_str)) {
return true;
}
#endif
# endif
break;
case CACHE_FILE_TYPE_INVALID:
break;
@ -158,6 +160,8 @@ static Mesh *generate_bounding_box_mesh(const Mesh *org_mesh)
return result;
}
#endif
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{
#if defined(WITH_USD) || defined(WITH_ALEMBIC)
@ -261,7 +265,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
return result ? result : mesh;
#else
UNUSED_VARS(ctx, md, generate_bounding_box_mesh);
UNUSED_VARS(ctx, md);
return mesh;
#endif
}