blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fluid: Updated Manta pp files 

Includes latest changes from the upstream manta repository.
This commit is contained in:
Sebastián Barschkis 2020-01-30 11:27:29 +01:00
parent 78872b3360
commit 5a570be9f5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/mantaflow/preprocessed/conjugategrad.cpp vendored
View File

@ -650,7 +650,7 @@ void cgSolveDiffusion(const FlagGrid &flags,
<< ", res:" << gcg->getSigma(),
CG_DEBUGLEVEL);
}
else if ((grid.getType() & GridBase::TypeVec3) || (grid.getType() & GridBase::TypeVec3)) {
else if ((grid.getType() & GridBase::TypeVec3) || (grid.getType() & GridBase::TypeMAC)) {
Grid<Vec3> &vec = ((Grid<Vec3> &)grid);
Grid<Real> u(parent);

2
extern/mantaflow/preprocessed/gitinfo.h vendored
View File

@ -1,3 +1,3 @@
#define MANTA_GIT_VERSION "commit 8d19f1096a4d8e115d9d1ec6024c65d53a94f47b"
#define MANTA_GIT_VERSION "commit 3f5c7989fd82920f0c509844a06e97dd1069191c"