Merge pull request #104 from olafhering/master

build fixes
YafaRay · Jul 13, 2017 · 361ab8e · 361ab8e
2 parents 1282cd5 + 48cabc9
commit 361ab8e
Show file tree

Hide file tree

Showing 236 changed files with 2 additions and 0 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/CMakeConfig/CPackConfig.txt b/CMakeConfig/CPackConfig.txt
diff --git a/CMakeConfig/GenConfHeaders.txt b/CMakeConfig/GenConfHeaders.txt
diff --git a/CMakeConfig/UserConfig.template b/CMakeConfig/UserConfig.template
diff --git a/CMakeConfig/templates/yaf_version.h.cmake b/CMakeConfig/templates/yaf_version.h.cmake
diff --git a/CMakeConfig/templates/yafray_config.h.cmake b/CMakeConfig/templates/yafray_config.h.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake
diff --git a/CMakeModules/FindYafPythonLibs.cmake b/CMakeModules/FindYafPythonLibs.cmake
diff --git a/CMakeModules/FindYafSWIG.cmake b/CMakeModules/FindYafSWIG.cmake
diff --git a/CMakeModules/UseYafSWIG.cmake b/CMakeModules/UseYafSWIG.cmake
diff --git a/CODING b/CODING
diff --git a/INSTALL b/INSTALL
diff --git a/LICENSES b/LICENSES
diff --git a/README b/README
diff --git a/building/linux/YafaRay Debian Testing building - Blender AddOn.txt b/building/linux/YafaRay Debian Testing building - Blender AddOn.txt
diff --git a/building/linux/YafaRay Debian Testing building - Standalone.txt b/building/linux/YafaRay Debian Testing building - Standalone.txt
diff --git a/building/linux/YafaRay Ubuntu 16.04 building - Blender AddOn.txt b/building/linux/YafaRay Ubuntu 16.04 building - Blender AddOn.txt
diff --git a/building/linux/YafaRay Ubuntu 16.04 building - Standalone.txt b/building/linux/YafaRay Ubuntu 16.04 building - Standalone.txt
diff --git a/building/linux/YafaRay Ubuntu 16.10 building - Blender AddOn.txt b/building/linux/YafaRay Ubuntu 16.10 building - Blender AddOn.txt
diff --git a/building/linux/YafaRay Ubuntu 16.10 building - Standalone.txt b/building/linux/YafaRay Ubuntu 16.10 building - Standalone.txt
diff --git a/building/win/YafaRay Windows 10 MinGW 64bit building - Blender AddOn.txt b/building/win/YafaRay Windows 10 MinGW 64bit building - Blender AddOn.txt
diff --git a/...ndows 10 MinGW 64bit building - Standalone with support for Sketchup 2016 Plugin Ruby.txt b/...ndows 10 MinGW 64bit building - Standalone with support for Sketchup 2016 Plugin Ruby.txt
diff --git a/...ndows 10 MinGW 64bit building - Standalone with support for Sketchup 2017 Plugin Ruby.txt b/...ndows 10 MinGW 64bit building - Standalone with support for Sketchup 2017 Plugin Ruby.txt
diff --git a/building/win/YafaRay Windows 10 MinGW 64bit building - Standalone.txt b/building/win/YafaRay Windows 10 MinGW 64bit building - Standalone.txt
diff --git a/include/cameras/angularCamera.h b/include/cameras/angularCamera.h
diff --git a/include/cameras/architectCamera.h b/include/cameras/architectCamera.h
diff --git a/include/cameras/orthographicCamera.h b/include/cameras/orthographicCamera.h
diff --git a/include/cameras/perspectiveCamera.h b/include/cameras/perspectiveCamera.h
diff --git a/include/core_api/background.h b/include/core_api/background.h
diff --git a/include/core_api/bound.h b/include/core_api/bound.h
diff --git a/include/core_api/camera.h b/include/core_api/camera.h
diff --git a/include/core_api/color.h b/include/core_api/color.h
diff --git a/include/core_api/color_console.h b/include/core_api/color_console.h
diff --git a/include/core_api/color_ramp.h b/include/core_api/color_ramp.h
diff --git a/include/core_api/environment.h b/include/core_api/environment.h
diff --git a/include/core_api/imagefilm.h b/include/core_api/imagefilm.h
diff --git a/include/core_api/imagehandler.h b/include/core_api/imagehandler.h
diff --git a/include/core_api/imagesplitter.h b/include/core_api/imagesplitter.h
diff --git a/include/core_api/integrator.h b/include/core_api/integrator.h
diff --git a/include/core_api/light.h b/include/core_api/light.h
diff --git a/include/core_api/logging.h b/include/core_api/logging.h
diff --git a/include/core_api/material.h b/include/core_api/material.h
diff --git a/include/core_api/matrix4.h b/include/core_api/matrix4.h
diff --git a/include/core_api/mcintegrator.h b/include/core_api/mcintegrator.h
diff --git a/include/core_api/object3d.h b/include/core_api/object3d.h
diff --git a/include/core_api/output.h b/include/core_api/output.h
diff --git a/include/core_api/params.h b/include/core_api/params.h
diff --git a/include/core_api/primitive.h b/include/core_api/primitive.h
diff --git a/include/core_api/ray.h b/include/core_api/ray.h
diff --git a/include/core_api/renderpasses.h b/include/core_api/renderpasses.h
diff --git a/include/core_api/sampling.h b/include/core_api/sampling.h
diff --git a/include/core_api/scene.h b/include/core_api/scene.h
diff --git a/include/core_api/session.h b/include/core_api/session.h
diff --git a/include/core_api/shader.h b/include/core_api/shader.h
diff --git a/include/core_api/surface.h b/include/core_api/surface.h
diff --git a/include/core_api/sysinfo.h b/include/core_api/sysinfo.h
diff --git a/include/core_api/texture.h b/include/core_api/texture.h
diff --git a/include/core_api/tiledintegrator.h b/include/core_api/tiledintegrator.h
diff --git a/include/core_api/vector3d.h b/include/core_api/vector3d.h
diff --git a/include/core_api/volume.h b/include/core_api/volume.h
diff --git a/include/core_api/yafsystem.h b/include/core_api/yafsystem.h
diff --git a/include/integrators/integr_utils.h b/include/integrators/integr_utils.h
diff --git a/include/integrators/photonintegr.h b/include/integrators/photonintegr.h
diff --git a/include/integrators/sppm.h b/include/integrators/sppm.h
diff --git a/include/interface/xmlinterface.h b/include/interface/xmlinterface.h
diff --git a/include/interface/yafrayinterface.h b/include/interface/yafrayinterface.h
diff --git a/include/lights/arealight.h b/include/lights/arealight.h
diff --git a/include/lights/bglight.h b/include/lights/bglight.h
diff --git a/include/lights/bgportallight.h b/include/lights/bgportallight.h
diff --git a/include/lights/meshlight.h b/include/lights/meshlight.h
diff --git a/include/materials/blendmat.h b/include/materials/blendmat.h
diff --git a/include/materials/maskmat.h b/include/materials/maskmat.h
diff --git a/include/materials/microfacet.h b/include/materials/microfacet.h
diff --git a/include/materials/roughglass.h b/include/materials/roughglass.h
diff --git a/include/materials/shinydiff.h b/include/materials/shinydiff.h
diff --git a/include/resources/guifont.h b/include/resources/guifont.h
diff --git a/include/resources/yafLogoTiny.h b/include/resources/yafLogoTiny.h
diff --git a/include/resources/yafarayicon.h b/include/resources/yafarayicon.h
diff --git a/include/textures/basicnodes.h b/include/textures/basicnodes.h
diff --git a/include/textures/basictex.h b/include/textures/basictex.h
diff --git a/include/textures/imagetex.h b/include/textures/imagetex.h
diff --git a/include/textures/layernode.h b/include/textures/layernode.h
diff --git a/include/textures/noise.h b/include/textures/noise.h
diff --git a/include/utilities/ColorConv.h b/include/utilities/ColorConv.h
diff --git a/include/utilities/buffer.h b/include/utilities/buffer.h
diff --git a/include/utilities/console_utils.h b/include/utilities/console_utils.h
diff --git a/include/utilities/curveUtils.h b/include/utilities/curveUtils.h
diff --git a/include/utilities/fileUtils.h b/include/utilities/fileUtils.h
diff --git a/include/utilities/geometry.h b/include/utilities/geometry.h
diff --git a/include/utilities/iesUtils.h b/include/utilities/iesUtils.h
diff --git a/include/utilities/image_buffers.h b/include/utilities/image_buffers.h
diff --git a/include/utilities/interpolation.h b/include/utilities/interpolation.h
diff --git a/include/utilities/mathOptimizations.h b/include/utilities/mathOptimizations.h
@@ -139,6 +139,7 @@ inline float fLog2(float x)
 	return (POLYLOG(m.f) * (m.f - one.f) + e.f);
 }
 
+#ifdef FAST_MATH
 inline float asmSqrt(float n)
 {
     float r = n;
@@ -167,6 +168,7 @@ inline float asmSqrt(float n)
 #endif
     return r;
 }
+#endif
 
 inline float fPow(float a, float b)
 {

diff --git a/include/utilities/math_utils.h b/include/utilities/math_utils.h
diff --git a/include/utilities/mcqmc.h b/include/utilities/mcqmc.h
diff --git a/include/utilities/sample_utils.h b/include/utilities/sample_utils.h
diff --git a/include/utilities/spectralData.h b/include/utilities/spectralData.h
diff --git a/include/utilities/stringUtils.h b/include/utilities/stringUtils.h
diff --git a/include/utilities/threadUtils.h b/include/utilities/threadUtils.h
diff --git a/include/utilities/tiled_array.h b/include/utilities/tiled_array.h
diff --git a/include/utilities/winunistd.h b/include/utilities/winunistd.h
diff --git a/include/utilities/y_alloc.h b/include/utilities/y_alloc.h
diff --git a/include/yafray_constants.h b/include/yafray_constants.h
diff --git a/include/yafraycore/hashgrid.h b/include/yafraycore/hashgrid.h
diff --git a/include/yafraycore/image.h b/include/yafraycore/image.h
diff --git a/include/yafraycore/imageOutput.h b/include/yafraycore/imageOutput.h
diff --git a/include/yafraycore/kdtree.h b/include/yafraycore/kdtree.h
diff --git a/include/yafraycore/memoryIO.h b/include/yafraycore/memoryIO.h
diff --git a/include/yafraycore/meshtypes.h b/include/yafraycore/meshtypes.h
diff --git a/include/yafraycore/monitor.h b/include/yafraycore/monitor.h
diff --git a/include/yafraycore/nodematerial.h b/include/yafraycore/nodematerial.h
diff --git a/include/yafraycore/octree.h b/include/yafraycore/octree.h
diff --git a/include/yafraycore/photon.h b/include/yafraycore/photon.h
diff --git a/include/yafraycore/pkdtree.h b/include/yafraycore/pkdtree.h
diff --git a/include/yafraycore/ray_kdtree.h b/include/yafraycore/ray_kdtree.h
diff --git a/include/yafraycore/scr_halton.h b/include/yafraycore/scr_halton.h
diff --git a/include/yafraycore/spectrum.h b/include/yafraycore/spectrum.h
diff --git a/include/yafraycore/std_primitives.h b/include/yafraycore/std_primitives.h
diff --git a/include/yafraycore/timer.h b/include/yafraycore/timer.h
diff --git a/include/yafraycore/triangle.h b/include/yafraycore/triangle.h
diff --git a/include/yafraycore/triangle_inline.h b/include/yafraycore/triangle_inline.h
diff --git a/include/yafraycore/xmlparser.h b/include/yafraycore/xmlparser.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/backgrounds/CMakeLists.txt b/src/backgrounds/CMakeLists.txt
diff --git a/src/backgrounds/darksky.cc b/src/backgrounds/darksky.cc
diff --git a/src/backgrounds/gradientback.cc b/src/backgrounds/gradientback.cc
diff --git a/src/backgrounds/sunsky.cc b/src/backgrounds/sunsky.cc
diff --git a/src/backgrounds/sunspectrum.cc b/src/backgrounds/sunspectrum.cc
diff --git a/src/backgrounds/textureback.cc b/src/backgrounds/textureback.cc
diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
diff --git a/src/bindings/yafaray_v3_interface.i b/src/bindings/yafaray_v3_interface.i
diff --git a/src/cameras/CMakeLists.txt b/src/cameras/CMakeLists.txt
diff --git a/src/cameras/angularCamera.cc b/src/cameras/angularCamera.cc
diff --git a/src/cameras/architectCamera.cc b/src/cameras/architectCamera.cc
diff --git a/src/cameras/orthographicCamera.cc b/src/cameras/orthographicCamera.cc
diff --git a/src/cameras/perspectiveCamera.cc b/src/cameras/perspectiveCamera.cc
diff --git a/src/image_handlers/CMakeLists.txt b/src/image_handlers/CMakeLists.txt
diff --git a/src/image_handlers/exrHandler.cc b/src/image_handlers/exrHandler.cc
diff --git a/src/image_handlers/hdrHandler.cc b/src/image_handlers/hdrHandler.cc
diff --git a/src/image_handlers/hdrUtils.h b/src/image_handlers/hdrUtils.h
diff --git a/src/image_handlers/jpgHandler.cc b/src/image_handlers/jpgHandler.cc
diff --git a/src/image_handlers/pngHandler.cc b/src/image_handlers/pngHandler.cc
diff --git a/src/image_handlers/pngUtils.h b/src/image_handlers/pngUtils.h
diff --git a/src/image_handlers/tgaHandler.cc b/src/image_handlers/tgaHandler.cc
diff --git a/src/image_handlers/tgaUtils.h b/src/image_handlers/tgaUtils.h
diff --git a/src/image_handlers/tifHandler.cc b/src/image_handlers/tifHandler.cc
diff --git a/src/integrators/CMakeLists.txt b/src/integrators/CMakeLists.txt
diff --git a/src/integrators/DebugIntegrator.cc b/src/integrators/DebugIntegrator.cc
diff --git a/src/integrators/EmissionIntegrator.cc b/src/integrators/EmissionIntegrator.cc
diff --git a/src/integrators/EmptyVolumeIntegrator.cc b/src/integrators/EmptyVolumeIntegrator.cc
diff --git a/src/integrators/SingleScatterIntegrator.cc b/src/integrators/SingleScatterIntegrator.cc
diff --git a/src/integrators/SkyIntegrator.cc b/src/integrators/SkyIntegrator.cc
diff --git a/src/integrators/bidirpath.cc b/src/integrators/bidirpath.cc
diff --git a/src/integrators/directlight.cc b/src/integrators/directlight.cc
diff --git a/src/integrators/pathtracer.cc b/src/integrators/pathtracer.cc
diff --git a/src/integrators/photonintegr.cc b/src/integrators/photonintegr.cc
diff --git a/src/integrators/sppm.cc b/src/integrators/sppm.cc
diff --git a/src/interface/CMakeLists.txt b/src/interface/CMakeLists.txt
diff --git a/src/interface/xmlinterface.cc b/src/interface/xmlinterface.cc
diff --git a/src/interface/yafrayinterface.cc b/src/interface/yafrayinterface.cc
diff --git a/src/lights/CMakeLists.txt b/src/lights/CMakeLists.txt
diff --git a/src/lights/arealight.cc b/src/lights/arealight.cc
diff --git a/src/lights/bglight.cc b/src/lights/bglight.cc
diff --git a/src/lights/bgportallight.cc b/src/lights/bgportallight.cc
diff --git a/src/lights/directional.cc b/src/lights/directional.cc
diff --git a/src/lights/iesLight.cc b/src/lights/iesLight.cc
diff --git a/src/lights/meshlight.cc b/src/lights/meshlight.cc
diff --git a/src/lights/pointlight.cc b/src/lights/pointlight.cc
diff --git a/src/lights/spherelight.cc b/src/lights/spherelight.cc
diff --git a/src/lights/spotlight.cc b/src/lights/spotlight.cc
diff --git a/src/lights/sunlight.cc b/src/lights/sunlight.cc
diff --git a/src/materials/CMakeLists.txt b/src/materials/CMakeLists.txt
diff --git a/src/materials/beer.cc b/src/materials/beer.cc
diff --git a/src/materials/blend.cc b/src/materials/blend.cc
diff --git a/src/materials/coatedglossy.cc b/src/materials/coatedglossy.cc
diff --git a/src/materials/glass.cc b/src/materials/glass.cc
diff --git a/src/materials/glossy.cc b/src/materials/glossy.cc
diff --git a/src/materials/mask.cc b/src/materials/mask.cc
diff --git a/src/materials/roughglass.cc b/src/materials/roughglass.cc
diff --git a/src/materials/shinydiffuse.cc b/src/materials/shinydiffuse.cc
diff --git a/src/materials/simple.cc b/src/materials/simple.cc
diff --git a/src/textures/CMakeLists.txt b/src/textures/CMakeLists.txt
diff --git a/src/textures/basicnodes.cc b/src/textures/basicnodes.cc
diff --git a/src/textures/basictex.cc b/src/textures/basictex.cc
diff --git a/src/textures/imagetex.cc b/src/textures/imagetex.cc
diff --git a/src/textures/layernode.cc b/src/textures/layernode.cc
diff --git a/src/textures/noise.cc b/src/textures/noise.cc
diff --git a/src/volumes/CMakeLists.txt b/src/volumes/CMakeLists.txt
diff --git a/src/volumes/ExpDensityVolume.cc b/src/volumes/ExpDensityVolume.cc
diff --git a/src/volumes/GridVolume.cc b/src/volumes/GridVolume.cc
diff --git a/src/volumes/NoiseVolume.cc b/src/volumes/NoiseVolume.cc
diff --git a/src/volumes/SkyVolume.cc b/src/volumes/SkyVolume.cc
diff --git a/src/volumes/UniformVolume.cc b/src/volumes/UniformVolume.cc
diff --git a/src/xml_loader/CMakeLists.txt b/src/xml_loader/CMakeLists.txt
diff --git a/src/xml_loader/xml-loader.cc b/src/xml_loader/xml-loader.cc
diff --git a/src/yafraycore/CMakeLists.txt b/src/yafraycore/CMakeLists.txt
diff --git a/src/yafraycore/bound.cc b/src/yafraycore/bound.cc
diff --git a/src/yafraycore/color.cc b/src/yafraycore/color.cc
diff --git a/src/yafraycore/color_console.cc b/src/yafraycore/color_console.cc
diff --git a/src/yafraycore/color_ramp.cc b/src/yafraycore/color_ramp.cc
diff --git a/src/yafraycore/console.cc b/src/yafraycore/console.cc
diff --git a/src/yafraycore/environment.cc b/src/yafraycore/environment.cc
diff --git a/src/yafraycore/faure_tables.cc b/src/yafraycore/faure_tables.cc
diff --git a/src/yafraycore/gboundtree.h b/src/yafraycore/gboundtree.h
diff --git a/src/yafraycore/hashgrid.cc b/src/yafraycore/hashgrid.cc
diff --git a/src/yafraycore/imageOutput.cc b/src/yafraycore/imageOutput.cc
diff --git a/src/yafraycore/imagefilm.cc b/src/yafraycore/imagefilm.cc
diff --git a/src/yafraycore/imagehandler.cc b/src/yafraycore/imagehandler.cc
diff --git a/src/yafraycore/imagesplitter.cc b/src/yafraycore/imagesplitter.cc
diff --git a/src/yafraycore/integrator.cc b/src/yafraycore/integrator.cc
diff --git a/src/yafraycore/kdtree.cc b/src/yafraycore/kdtree.cc
diff --git a/src/yafraycore/logging.cc b/src/yafraycore/logging.cc
diff --git a/src/yafraycore/material.cc b/src/yafraycore/material.cc
diff --git a/src/yafraycore/matrix4.cc b/src/yafraycore/matrix4.cc
diff --git a/src/yafraycore/mcintegrator.cc b/src/yafraycore/mcintegrator.cc
diff --git a/src/yafraycore/memoryIO.cc b/src/yafraycore/memoryIO.cc
diff --git a/src/yafraycore/nodematerial.cc b/src/yafraycore/nodematerial.cc
diff --git a/src/yafraycore/object3d.cc b/src/yafraycore/object3d.cc
diff --git a/src/yafraycore/photon.cc b/src/yafraycore/photon.cc
diff --git a/src/yafraycore/ray_kdtree.cc b/src/yafraycore/ray_kdtree.cc
diff --git a/src/yafraycore/renderpasses.cc b/src/yafraycore/renderpasses.cc
diff --git a/src/yafraycore/scene.cc b/src/yafraycore/scene.cc
diff --git a/src/yafraycore/session.cc b/src/yafraycore/session.cc
diff --git a/src/yafraycore/spectrum.cc b/src/yafraycore/spectrum.cc
diff --git a/src/yafraycore/std_primitives.cc b/src/yafraycore/std_primitives.cc
diff --git a/src/yafraycore/surface.cc b/src/yafraycore/surface.cc
diff --git a/src/yafraycore/sysinfo.cc b/src/yafraycore/sysinfo.cc
diff --git a/src/yafraycore/timer.cc b/src/yafraycore/timer.cc
diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
diff --git a/src/yafraycore/tribox3_d.cc b/src/yafraycore/tribox3_d.cc
diff --git a/src/yafraycore/triclip.cc b/src/yafraycore/triclip.cc
diff --git a/src/yafraycore/vector3d.cc b/src/yafraycore/vector3d.cc
diff --git a/src/yafraycore/volume.cc b/src/yafraycore/volume.cc
diff --git a/src/yafraycore/xmlparser.cc b/src/yafraycore/xmlparser.cc
diff --git a/src/yafraycore/yafsystem.cc b/src/yafraycore/yafsystem.cc