Revision: 15565
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15565
Author:   genscher
Date:     2008-07-14 14:24:49 +0200 (Mon, 14 Jul 2008)

Log Message:
-----------
Win64 fix: disable 1GB restriction for 64bit windows systems, baking fluid with 
>4GB is verified to work on Vista64.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/solver_init.cpp

Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp  2008-07-14 10:26:11 UTC 
(rev 15564)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp  2008-07-14 12:24:49 UTC 
(rev 15565)
@@ -694,7 +694,7 @@
                double maxDefaultMemChunk = 2.*1024.*1024.*1024.;
                //std::cerr<<" memEstFine "<< memEstFine <<" maxWin:" 
<<maxWinMemChunk <<" maxMac:" <<maxMacMemChunk ; // DEBUG
 #ifdef WIN32
-               if(memEstFine> maxWinMemChunk) {
+               if(sizeof(void *)==4 && memEstFine>maxWinMemChunk) {
                        memBlockAllocProblem = true;
                }
 #endif // WIN32


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to