diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2014-02-05 18:30:10 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2014-02-05 18:37:38 +0400 |
| commit | 1ab86e3f1fa8a32c2e6fa778fe926eb9979fb3e8 (patch) | |
| tree | 19e2170cadf4ef23a918fbaa747f36d3c26939e4 /intern/elbeem | |
| parent | 6213d88c851d8a120b74056a6cc90a95d0cccddd (diff) | |
Fix T36769: fluid sim modifier can crash blender
Crash only happened when the number of openmp threads were greater than the resolution.
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 4c398ab9cb4..fcb9cbf937c 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -799,6 +799,15 @@ bool LbmFsgrSolver::initializeSolverMemory() mLevel[i].avgOmegaCnt = 0.0; } + /* + // DG: this would be the correct sanity check, not the "hack below" */ + // if(( mSizey / mNumOMPThreads) * mNumOMPThreads != mSizey) { + // setNumOMPThreads(); + //} + if( mSizey < mNumOMPThreads ) { + setNumOMPThreads(mSizey); + } + // init sizes mLevel[mMaxRefine].lSizex = mSizex; mLevel[mMaxRefine].lSizey = mSizey; |