bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.82-release'

Browse Source
This commit is contained in:
Sebastián Barschkis 2020-02-07 15:21:26 +01:00
commit 1a93bc2db8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2798,8 +2798,10 @@ int MANTA::updateGridFromFile(const char *filename, float *grid)
if (extension.compare("uni") == 0)
return updateGridFromUni(filename, grid);
#ifdef WITH_OPENVDB
else if (extension.compare("vdb") == 0)
return updateGridFromVDB(filename, grid);
#endif
else if (extension.compare("raw") == 0)
return updateGridFromRaw(filename, grid);
else
@ -2884,6 +2886,7 @@ int MANTA::updateGridFromUni(const char *filename, float *grid)
return 1;
}
#ifdef WITH_OPENVDB
int MANTA::updateGridFromVDB(const char *filename, float *grid)
{
if (with_debug)
@ -2922,6 +2925,7 @@ int MANTA::updateGridFromVDB(const char *filename, float *grid)
}
return 1;
}
#endif
int MANTA::updateGridFromRaw(const char *filename, float *grid)
{