diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-14 17:39:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-14 17:39:48 +0400 |
| commit | a1fea54c185527a13aad3c3e5da81786fae3e13d (patch) | |
| tree | 06cf1d93307e649b8bb7b927fe5cb208b8fc82c4 /intern/elbeem | |
| parent | 00c4265bda4eda13ae52c6b2082edf69239aab9f (diff) | |
svn merge -r15560:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Also topology mirror crashed when using smooth + mirror. use eve->hash rather them eve->tmp.l for storing edit vert indices's.
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index c953d2f47da..a873f3c6987 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -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 |