sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OpenVDB: Fix IOError in try catch statement

Browse Source 
Broader exception handling for OpenVDB IO errors.
This commit is contained in:
Sebastián Barschkis 2020-02-06 17:24:09 +01:00
parent e7d71ce9cf
commit 1bb702df1e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/mantaflow/intern/MANTA_main.cpp
View File

@ -2174,6 +2174,7 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd)
bool floater = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM; bool floater = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM;
bool tracer = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER; bool tracer = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER;
bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE; bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE;
bool fractions = mmd->domain->flags & FLUID_DOMAIN_USE_FRACTIONS;
bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE; bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE;
bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL; bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL;
@ -2210,6 +2211,8 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd)
manta_script += fluid_alloc_guiding; manta_script += fluid_alloc_guiding;
if (obstacle) if (obstacle)
manta_script += fluid_alloc_obstacle; manta_script += fluid_alloc_obstacle;
if (fractions)
manta_script += fluid_alloc_fractions;
if (invel) if (invel)
manta_script += fluid_alloc_invel; manta_script += fluid_alloc_invel;
@ -2891,7 +2894,7 @@ int MANTA::updateGridFromVDB(const char *filename, float *grid)
try { try {
file.open(); file.open();
} }
catch (const openvdb::v5_1::IoError) { catch (const openvdb::IoError) {
std::cout << "MANTA::updateGridFromVDB(): IOError, invalid OpenVDB file: " << filename std::cout << "MANTA::updateGridFromVDB(): IOError, invalid OpenVDB file: " << filename
<< std::endl; << std::endl;
return 0; return 0;