[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13636] trunk/blender: * change integral type of loop var in two cases so OpenMP support compiles with MSVC , too.
Nathan Letwory
jesterking at letwory.net
Mon Feb 11 09:27:57 CET 2008
Revision: 13636
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13636
Author: jesterking
Date: 2008-02-11 09:27:54 +0100 (Mon, 11 Feb 2008)
Log Message:
-----------
* change integral type of loop var in two cases so OpenMP support compiles with MSVC, too.
* remove wrong flag.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/blenkernel/intern/implicit.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-02-11 03:16:22 UTC (rev 13635)
+++ trunk/blender/SConstruct 2008-02-11 08:27:54 UTC (rev 13636)
@@ -181,7 +181,6 @@
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM']=='win32-vc':
- env.Append(LINKFLAGS=['/openmp'])
env['CCFLAGS'].append('/openmp')
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-11 03:16:22 UTC (rev 13635)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-02-11 08:27:54 UTC (rev 13636)
@@ -254,11 +254,11 @@
/* dot product for big vector */
DO_INLINE float dot_lfvector(float (*fLongVectorA)[3], float (*fLongVectorB)[3], unsigned int verts)
{
- unsigned int i = 0;
+ long i = 0;
float temp = 0.0;
// schedule(guided, 2)
#pragma omp parallel for reduction(+: temp)
- for(i = 0; i < verts; i++)
+ for(i = 0; i < (long)verts; i++)
{
temp += INPR(fLongVectorA[i], fLongVectorB[i]);
}
@@ -1433,7 +1433,7 @@
{
/* Collect forces and derivatives: F,dFdX,dFdV */
Cloth *cloth = clmd->clothObject;
- unsigned int i = 0;
+ long i = 0;
float spring_air = clmd->sim_parms->Cvi * 0.01f; /* viscosity of air scaled in percent */
float gravity[3];
float tm2[3][3] = {{-spring_air,0,0}, {0,-spring_air,0},{0,0,-spring_air}};
@@ -1457,7 +1457,7 @@
init_lfvector(lF, gravity, numverts);
// multiply lF with mass matrix
- for(i = 0; i < numverts; i++)
+ for(i = 0; i < (long)numverts; i++)
{
float temp[3];
VECCOPY(temp, lF[i]);
@@ -1473,7 +1473,7 @@
float force[3]= {0.0f, 0.0f, 0.0f};
#pragma omp parallel for private (i) shared(lF)
- for(i = 0; i < cloth->numverts; i++)
+ for(i = 0; i < (long)(cloth->numverts); i++)
{
float vertexnormal[3]={0,0,0};
float fieldfactor = 1000.0f; // windfactor = 250.0f; // from sb
More information about the Bf-blender-cvs
mailing list