diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /extern/carve/patches/random.patch | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'extern/carve/patches/random.patch')
| -rw-r--r-- | extern/carve/patches/random.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/extern/carve/patches/random.patch b/extern/carve/patches/random.patch new file mode 100644 index 00000000000..36cc8d10430 --- /dev/null +++ b/extern/carve/patches/random.patch @@ -0,0 +1,16 @@ +diff -r 9a85d733a43d lib/polyhedron.cpp +--- a/lib/polyhedron.cpp Tue Jun 24 11:15:23 2014 +1000 ++++ b/lib/polyhedron.cpp Thu Nov 13 17:36:06 2014 +0500 +@@ -36,7 +36,11 @@ + + #include <carve/mesh.hpp> + +-#include BOOST_INCLUDE(random.hpp) ++#ifdef HAVE_BOOST_LIBRARY ++# include BOOST_INCLUDE(random.hpp) ++#else ++# include <carve/random/random.h> ++#endif + + namespace { + bool emb_test(carve::poly::Polyhedron *poly, |