From 22f170f487b70e7613acfbe13923a5bef4bfd536 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 24 May 2013 10:15:20 +0000 Subject: [PATCH] fix for building on osx with recent freestyle bugfix. --- CMakeLists.txt | 1 + source/blender/freestyle/intern/system/PseudoNoise.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4355a7c56a..0379e46bc71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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:") diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 538460dc1e9..634274874d3 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp @@ -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;