From ff9a4e445e62a63b6baaa48cefd7357d62fd87c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 Jul 2012 06:45:43 +0000 Subject: fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading. --- intern/smoke/intern/MERSENNETWISTER.h | 2 +- intern/smoke/intern/smoke_API.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/smoke') 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; } -- cgit v1.2.3