[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48519] trunk/blender/intern/smoke/intern: fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading.

Campbell Barton ideasman42 at gmail.com
Tue Jul 3 08:45:46 CEST 2012


Revision: 48519
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48519
Author:   campbellbarton
Date:     2012-07-03 06:45:43 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading.

Modified Paths:
--------------
    trunk/blender/intern/smoke/intern/MERSENNETWISTER.h
    trunk/blender/intern/smoke/intern/smoke_API.cpp

Modified: trunk/blender/intern/smoke/intern/MERSENNETWISTER.h
===================================================================
--- trunk/blender/intern/smoke/intern/MERSENNETWISTER.h	2012-07-03 05:46:44 UTC (rev 48518)
+++ trunk/blender/intern/smoke/intern/MERSENNETWISTER.h	2012-07-03 06:45:43 UTC (rev 48519)
@@ -234,7 +234,7 @@
 	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] =

Modified: trunk/blender/intern/smoke/intern/smoke_API.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/smoke_API.cpp	2012-07-03 05:46:44 UTC (rev 48518)
+++ trunk/blender/intern/smoke/intern/smoke_API.cpp	2012-07-03 06:45:43 UTC (rev 48519)
@@ -198,8 +198,8 @@
 	*vyold = fluid->_yVelocityOld;
 	*vzold = fluid->_zVelocityOld;
 	*obstacles = fluid->_obstacles;
-	dt = &(fluid->_dt);
-	dx = &(fluid->_dx);
+	*dt = fluid->_dt;
+	*dx = fluid->_dx;
 
 }
 




More information about the Bf-blender-cvs mailing list