diff options
| author | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
| commit | 70edf4e2933f9a402de70298352b8775540baf15 (patch) | |
| tree | 779e302a80ce55c37cc071adbda8572fe6ce259f /source/blender/render/intern | |
| parent | 5f648881377c13d337c2c648e5747bc66ce92cf2 (diff) | |
fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set)
- jesterKing, could you please check if that's ok?
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 03f5fb03fea..ffae43945bb 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -736,8 +736,8 @@ static void QMC_freeSampler(QMCSampler *qsa) static void QMC_getSample(double *s, QMCSampler *qsa, int thread, int num) { if (qsa->type == SAMP_TYPE_HAMMERSLEY) { - s[0] = fmodf(qsa->samp2d[2*num+0] + qsa->offs[thread][0], 1.0f); - s[1] = fmodf(qsa->samp2d[2*num+1] + qsa->offs[thread][1], 1.0f); + s[0] = fmod(qsa->samp2d[2*num+0] + qsa->offs[thread][0], 1.0f); + s[1] = fmod(qsa->samp2d[2*num+1] + qsa->offs[thread][1], 1.0f); } else { /* SAMP_TYPE_HALTON */ s[0] = qsa->samp2d[2*num+0]; |