diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-20 12:52:48 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-20 12:52:48 +0400 |
| commit | 037f1188e63c1b8b05d9421ee8f6395bcb3f1ab7 (patch) | |
| tree | c9476e0daa75e0e4dbd8cfc9035f851067d4ea29 /intern/elbeem | |
| parent | b369936b1168984b37b04d4d78184ce59442de9e (diff) | |
| parent | a8785893c5657592c9cc27ce844664b5d62397de (diff) | |
svn merge -r 15529:15649 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/controlparticles.cpp | 2 | ||||
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/intern/elbeem/intern/controlparticles.cpp b/intern/elbeem/intern/controlparticles.cpp index 70a94bb2d1a..75b7e9bfd80 100644 --- a/intern/elbeem/intern/controlparticles.cpp +++ b/intern/elbeem/intern/controlparticles.cpp @@ -177,8 +177,6 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) { } model->setGeoInitType(FGI_CONTROL); - - initTime(mCPSTimeStart , mCPSTimeEnd); delete tree; delete genscene; diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index fd7a0b6be2c..b1222d48ce5 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -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 |