merge

data/cmake/packaging/MtsFixupBundle.cmake.in

@@ -126,5 +126,8 @@ set (libpaths "@MTS_LIBPATHS@")
 # Use our custom version of fixup_bundle, which supports @rpath on OS X
 list(APPEND CMAKE_MODULE_PATH "@CMAKE_MODULE_PATH@")
 include("MtsBundleUtilities")
+if(APPLE)
+  set(BU_CHMOD_BUNDLE_ITEMS ON)
+endif()
 mts_fixup_bundle("${APP}" "${MTSPLUGINS};${QTPLUGINS};${PYBINDINGS}" "${libpaths}")
 

src/integrators/photonmapper/sppm.cpp

@@ -103,7 +103,7 @@ public:
 		m_rrDepth = props.getInteger("rrDepth", 3);
 		/* Indicates if the gathering steps should be canceled if not enough photons are generated. */
 		m_autoCancelGathering = props.getBoolean("autoCancelGathering", true);
-        /* Maximum number of passes to render. -1 renders until the process is stopped. */
+		/* Maximum number of passes to render. -1 renders until the process is stopped. */
 		m_maxPasses = props.getInteger("maxPasses", -1);
 		m_mutex = new Mutex();
 		if (m_maxDepth <= 1 && m_maxDepth != -1)

src/shapes/CMakeLists.txt

@@ -19,6 +19,7 @@ add_shape(cube       cube.cpp)
 add_shape(hair       hair.h hair.cpp)
 add_shape(shapegroup shapegroup.h shapegroup.cpp)
 add_shape(instance   instance.h instance.cpp)
+add_shape(heightfield heightfield.cpp)
 #add_shape(deformable deformable.cpp)
 add_shape(ply ply.cpp ply/ply_parser.cpp 
   ply/byte_order.hpp ply/config.hpp ply/io_operators.hpp