fix for smoke writing uninitialized values to pointcache, not a big deal since they...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 06:45:43 +0000 (06:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 06:45:43 +0000 (06:45 +0000)
intern/smoke/intern/MERSENNETWISTER.h
intern/smoke/intern/smoke_API.cpp

index 116568c283466462cbcc29a708e6d14ad14b0616..5a9ccf88ae78f343c8bda64510db8b7f2ea23aae 100644 (file)
@@ -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] =
index ce298cff0d25d95026b5f5821080e1b68f2dfc9c..b45fef2650476fcc540d031337c0155dc3e3efe5 100644 (file)
@@ -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;
 
 }