[Bf-blender-cvs] [762aad3] master: Correct OpenMP pragma, wasn't updated for looptri

Campbell Barton noreply at git.blender.org
Thu Dec 3 13:02:57 CET 2015


Commit: 762aad37779e9e0654b4746df35710f850438329
Author: Campbell Barton
Date:   Thu Dec 3 22:55:20 2015 +1100
Branches: master
https://developer.blender.org/rB762aad37779e9e0654b4746df35710f850438329

Correct OpenMP pragma, wasn't updated for looptri

===================================================================

M	source/blender/blenkernel/intern/multires.c

===================================================================

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index fb7463b..b6895e6 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -2227,7 +2227,7 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3])
 	dGridSize = multires_side_tot[high_mmd.totlvl];
 	dSkip = (dGridSize - 1) / (gridSize - 1);
 
-#pragma omp parallel for private(i) if (me->totface * gridSize * gridSize * 4 >= CCG_OMP_LIMIT)
+#pragma omp parallel for private(i) if (me->totloop * gridSize * gridSize >= CCG_OMP_LIMIT)
 	for (i = 0; i < me->totpoly; ++i) {
 		const int numVerts = mpoly[i].totloop;
 		MDisps *mdisp = &mdisps[mpoly[i].loopstart];




More information about the Bf-blender-cvs mailing list