diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-03 10:45:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-03 10:45:43 +0400 |
| commit | ff9a4e445e62a63b6baaa48cefd7357d62fd87c1 (patch) | |
| tree | 3c98ae4e9febfa394b54936df4bbcb82890140f0 /intern/smoke | |
| parent | 6a2a424c400f202358c9e930a46b1379f6e2a688 (diff) | |
fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading.
Diffstat (limited to 'intern/smoke')
| -rw-r--r-- | intern/smoke/intern/MERSENNETWISTER.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/smoke_API.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/smoke/intern/MERSENNETWISTER.h b/intern/smoke/intern/MERSENNETWISTER.h index 116568c2834..5a9ccf88ae7 100644 --- a/intern/smoke/intern/MERSENNETWISTER.h +++ b/intern/smoke/intern/MERSENNETWISTER.h @@ -234,7 +234,7 @@ inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) initialize(19650218UL); register int i = 1; register uint32 j = 0; - register int k = ( N > seedLength ? N : seedLength ); + register int k = ( (uint32)N > seedLength ? (uint32)N : seedLength ); for( ; k; --k ) { state[i] = diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp index ce298cff0d2..b45fef26504 100644 --- a/intern/smoke/intern/smoke_API.cpp +++ b/intern/smoke/intern/smoke_API.cpp @@ -198,8 +198,8 @@ extern "C" void smoke_export(FLUID_3D *fluid, float *dt, float *dx, float **dens *vyold = fluid->_yVelocityOld; *vzold = fluid->_zVelocityOld; *obstacles = fluid->_obstacles; - dt = &(fluid->_dt); - dx = &(fluid->_dx); + *dt = fluid->_dt; + *dx = fluid->_dx; } |