Revision: 56997
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56997
Author: campbellbarton
Date: 2013-05-24 10:15:20 +0000 (Fri, 24 May 2013)
Log Message:
-----------
fix for building on osx with recent freestyle bugfix.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-05-24 10:05:25 UTC (rev 56996)
+++ trunk/blender/CMakeLists.txt 2013-05-24 10:15:20 UTC (rev 56997)
@@ -2234,6 +2234,7 @@
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:")
Modified: trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.cpp
2013-05-24 10:05:25 UTC (rev 56996)
+++ trunk/blender/source/blender/freestyle/intern/system/PseudoNoise.cpp
2013-05-24 10:15:20 UTC (rev 56997)
@@ -46,7 +46,7 @@
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 @@
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
