Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / intern / elbeem / intern / solver_init.cpp
index c953d2f47da66979878b645e62bfc1f28aec0679..a873f3c69874587ad84d61382ee1d2dee4f3b26a 100644 (file)
@@ -694,7 +694,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
                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