svn merge -r 15529:15649 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / intern / elbeem / intern / solver_init.cpp
index fd7a0b6be2c1543c2f855b392bce079fa3fe6238..b1222d48ce54508be9ba42d57ebca51ae0519dd4 100644 (file)
@@ -704,7 +704,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
                //std::cerr<<" memEstFine "<< memEstFine <<" maxWin:" <<maxWinMemChunk <<" maxMac:" <<maxMacMemChunk ; // DEBUG
 #ifdef WIN32
                double maxWinMemChunk = 1100.*1024.*1024.;
-               if(memEstFine> maxWinMemChunk) {
+               if(sizeof(void *)==4 && memEstFine>maxWinMemChunk) {
                        memBlockAllocProblem = true;
                }
 #endif // WIN32