blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Fix MSVC warning in mantaflow 

This resolves the following MSVC warning:

warning C4805: '&=': unsafe mix of type 'int' and type 'bool' in operation
This commit is contained in:
Ray molenkamp 2020-08-26 19:07:24 -06:00
parent 479ce00809
commit 6438fc4f79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}