Commit: 1ab86e3f1fa8a32c2e6fa778fe926eb9979fb3e8
Author: Daniel Genrich
Date: Wed Feb 5 15:30:10 2014 +0100
https://developer.blender.org/rB1ab86e3f1fa8a32c2e6fa778fe926eb9979fb3e8
Fix T36769: fluid sim modifier can crash blender
Crash only happened when the number of openmp threads were greater than the
resolution.
===================================================================
M intern/elbeem/intern/solver_init.cpp
===================================================================
diff --git a/intern/elbeem/intern/solver_init.cpp
b/intern/elbeem/intern/solver_init.cpp
index 4c398ab..fcb9cbf 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
