From 6438fc4f794bd8e6f1eedc48c3812e907ecc059a Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 26 Aug 2020 19:07:24 -0600 Subject: Cleanup: Fix MSVC warning in mantaflow This resolves the following MSVC warning: warning C4805: '&=': unsafe mix of type 'int' and type 'bool' in operation --- intern/mantaflow/intern/manta_fluid_API.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/mantaflow') 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); } -- cgit v1.2.3