bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for building on osx with recent freestyle bugfix.

Browse Source
This commit is contained in:
Campbell Barton 2013-05-24 10:15:20 +00:00
parent 5fdf868d80
commit 22f170f487
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -2234,6 +2234,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
info_cfg_option(WITH_CYCLES)
info_cfg_option(WITH_FREESTYLE)
info_cfg_option(WITH_OPENCOLORIO)
info_cfg_text("Compiler Options:")

4
source/blender/freestyle/intern/system/PseudoNoise.cpp
View File

@ -46,7 +46,7 @@ void PseudoNoise::init(long seed)
real PseudoNoise::linearNoise(real x)
{
real tmp;
int i = abs(modf(x, &tmp)) * NB_VALUE_NOISE;
int i = abs((int)(modf(x, &tmp) * NB_VALUE_NOISE));
real x1 = _values[i], x2 = _values[(i + 1) % NB_VALUE_NOISE];
real t = modf(x * NB_VALUE_NOISE, &tmp);
return x1 * (1 - t) + x2 * t;
@ -64,7 +64,7 @@ static real LanczosWindowed(real t)
real PseudoNoise::smoothNoise(real x)
{
real tmp;
int i = abs(modf(x, &tmp)) * NB_VALUE_NOISE;
int i = abs((int)(modf(x, &tmp) * NB_VALUE_NOISE));
int h = i - 1;
if (h < 0) {
h = NB_VALUE_NOISE + h;