diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-08-27 04:07:24 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-08-27 04:07:24 +0300 |
| commit | 6438fc4f794bd8e6f1eedc48c3812e907ecc059a (patch) | |
| tree | 8db14fd7eb56b9d8a6483ca2cf5632804962fe53 /intern/mantaflow | |
| parent | 479ce00809af30167a88525cdc7cddc704ed67ba (diff) | |
Cleanup: Fix MSVC warning in mantaflow
This resolves the following MSVC warning:
warning C4805: '&=': unsafe mix of type 'int' and type 'bool' in operation
Diffstat (limited to 'intern/mantaflow')
| -rw-r--r-- | intern/mantaflow/intern/manta_fluid_API.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp index 530dbd49b7c..7f96a315a8e 100644 --- a/intern/mantaflow/intern/manta_fluid_API.cpp +++ b/intern/mantaflow/intern/manta_fluid_API.cpp @@ -456,7 +456,7 @@ int manta_smoke_ensure_fire(MANTA *smoke, struct FluidModifierData *fmd) if (!smoke || !fmd) return 0; - int result = smoke->initFire(fmd); + bool result = smoke->initFire(fmd); if (smoke->usingNoise()) { result &= smoke->initFireHigh(fmd); } @@ -468,7 +468,7 @@ int manta_smoke_ensure_colors(MANTA *smoke, struct FluidModifierData *fmd) if (!smoke || !fmd) return 0; - int result = smoke->initColors(fmd); + bool result = smoke->initColors(fmd); if (smoke->usingNoise()) { result &= smoke->initColorsHigh(fmd); } |