diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-20 15:31:55 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-20 15:31:55 +0400 |
commit | 27c5dc3449cfa61cc5c190f5d71033eb650a65b7 (patch) | |
tree | 2bab44a3e501755cebcf290a378cbf1e1b818646 /intern/smoke | |
parent | 5b499cca762a640307d6c9e6c395ba7cd3930c2c (diff) |
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.
Diffstat (limited to 'intern/smoke')
-rw-r--r-- | intern/smoke/intern/WTURBULENCE.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp index 6d43bc95471..917c510348a 100644 --- a/intern/smoke/intern/WTURBULENCE.cpp +++ b/intern/smoke/intern/WTURBULENCE.cpp @@ -825,13 +825,18 @@ void WTURBULENCE::stepTurbulenceFull(float dtOrg, float* xvel, float* yvel, floa // 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; |