diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:20:44 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:20:44 +0100 |
commit | 1304264d6db97d622783a1a3d6c9933e029e1dae (patch) | |
tree | 512ab2680ded6dd9cc21ecccd66c20b8da7edc20 /media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch | |
parent | 1ca20f8af778c6f7b860fc093f779d63804e83a2 (diff) | |
parent | b68bd360ef1c8817650e105f9c8187b82e428765 (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch')
-rw-r--r-- | media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch new file mode 100644 index 00000000..0ecc960d --- /dev/null +++ b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch @@ -0,0 +1,31 @@ +diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp +index 68f7c04..514087b 100644 +--- a/intern/elbeem/intern/solver_main.cpp ++++ b/intern/elbeem/intern/solver_main.cpp +@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev) + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ +@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids() + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ +@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit() + GRID_REGION_INIT(); + #if PARALLEL==1 + const int gDebugLevel = ::gDebugLevel; +-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ ++#pragma omp parallel num_threads(mNumOMPThreads) \ + reduction(+: \ + calcCurrentMass,calcCurrentVolume, \ + calcCellsFilled,calcCellsEmptied, \ |