[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31480] trunk/blender/intern/smoke/intern/ WTURBULENCE.cpp: Fix #23198: openmp building for OS X ppc gave errors about non-relocatable

Brecht Van Lommel brecht at blender.org
Fri Aug 20 13:31:55 CEST 2010


Revision: 31480
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31480
Author:   blendix
Date:     2010-08-20 13:31:55 +0200 (Fri, 20 Aug 2010)

Log Message:
-----------
Fix #23198: openmp building for OS X ppc gave errors about non-relocatable
expression here. Not sure why, perhaps compiler bug, but this simple change
fixes it.

Modified Paths:
--------------
    trunk/blender/intern/smoke/intern/WTURBULENCE.cpp

Modified: trunk/blender/intern/smoke/intern/WTURBULENCE.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/WTURBULENCE.cpp	2010-08-20 11:12:13 UTC (rev 31479)
+++ trunk/blender/intern/smoke/intern/WTURBULENCE.cpp	2010-08-20 11:31:55 UTC (rev 31480)
@@ -825,13 +825,18 @@
     // get LU factorization of texture jacobian and apply 
     // it to unit vectors
     sLU LU = computeLU(jacobian);
-    float xUnwarped[] = {1.0f, 0.0f, 0.0f};
-    float yUnwarped[] = {0.0f, 1.0f, 0.0f};
-    float zUnwarped[] = {0.0f, 0.0f, 1.0f};
-    float xWarped[] = {1.0f, 0.0f, 0.0f};
-    float yWarped[] = {0.0f, 1.0f, 0.0f};
-    float zWarped[] = {0.0f, 0.0f, 1.0f};
+    float xUnwarped[3], yUnwarped[3], zUnwarped[3];
+    float xWarped[3], yWarped[3], zWarped[3];
     bool nonSingular = isNonsingular(LU);
+
+	xUnwarped[0] = 1.0f; xUnwarped[1] = 0.0f; xUnwarped[2] = 0.0f;
+	yUnwarped[0] = 0.0f; yUnwarped[1] = 1.0f; yUnwarped[2] = 0.0f;
+	zUnwarped[0] = 0.0f; zUnwarped[1] = 0.0f; zUnwarped[2] = 1.0f;
+
+	xWarped[0] = 1.0f; xWarped[1] = 0.0f; xWarped[2] = 0.0f;
+	yWarped[0] = 0.0f; yWarped[1] = 1.0f; yWarped[2] = 0.0f;
+	zWarped[0] = 0.0f; zWarped[1] = 0.0f; zWarped[2] = 1.0f;
+
 #if 0
 	// UNUSED
     float eigMax = 10.0f;





More information about the Bf-blender-cvs mailing list