Merge pull request #1431 from est77/est_release_work

1.7 release work
appleseedhq · May 29, 2017 · 57b8da9 · 57b8da9
2 parents f977ba6 + 2f81827
commit 57b8da9
Show file tree

Hide file tree

Showing 78 changed files with 477 additions and 5,494 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,7 +108,6 @@ option (WITH_STUDIO                         "Build appleseed.studio"
 option (WITH_TOOLS                          "Build appleseed tools"                                 ON)
 option (WITH_PYTHON                         "Build Python bindings"                                 ON)
 option (WITH_DISNEY_MATERIAL                "Build Disney material"                                 OFF)
-option (WITH_PARTIO                         "Build Partio support (used in unit tests)"             OFF)
 
 option (USE_CPP11                           "Use C++11"                                             OFF)
 option (USE_STATIC_BOOST                    "Use static Boost libraries"                            ON)
@@ -255,11 +254,6 @@ if (WITH_DISNEY_MATERIAL)
     endif ()
 endif ()
 
-if (WITH_PARTIO)
-    add_definitions (-DAPPLESEED_WITH_PARTIO)
-    find_package (Partio REQUIRED)
-endif ()
-
 
 #--------------------------------------------------------------------------------------------------
 # Include paths.
@@ -329,10 +323,6 @@ if (WITH_DISNEY_MATERIAL)
     endif ()
 endif ()
 
-if (WITH_PARTIO)
-    include_directories (${PARTIO_INCLUDE_DIRS})
-endif ()
-
 
 #--------------------------------------------------------------------------------------------------
 # Preprocessor definitions.

diff --git a/sandbox/tests/test scenes/bssrdf/ref/79 - osl - gaussian.png b/sandbox/tests/test scenes/bssrdf/ref/79 - osl - gaussian.png
diff --git a/sandbox/tests/test scenes/bssrdf/ref/80 - osl - stddipole.png b/sandbox/tests/test scenes/bssrdf/ref/80 - osl - stddipole.png
diff --git a/sandbox/tests/test scenes/bssrdf/ref/81 - osl - betterdipole.png b/sandbox/tests/test scenes/bssrdf/ref/81 - osl - betterdipole.png
diff --git a/sandbox/tests/test scenes/bssrdf/ref/82 - osl - directionaldipole.png b/sandbox/tests/test scenes/bssrdf/ref/82 - osl - directionaldipole.png
diff --git a/sandbox/tests/test scenes/bssrdf/ref/83 - osl - normalizeddiff.png b/sandbox/tests/test scenes/bssrdf/ref/83 - osl - normalizeddiff.png
diff --git a/sandbox/tests/test scenes/osl/ref/01 - lambertian osl - ptne.png b/sandbox/tests/test scenes/osl/ref/01 - lambertian osl - ptne.png
diff --git a/sandbox/tests/test scenes/osl/ref/02 - simple glass.png b/sandbox/tests/test scenes/osl/ref/02 - simple glass.png
diff --git a/sandbox/tests/test scenes/osl/ref/03 - glass absorption.png b/sandbox/tests/test scenes/osl/ref/03 - glass absorption.png
diff --git a/sandbox/tests/test scenes/osl/ref/04 - transparency.png b/sandbox/tests/test scenes/osl/ref/04 - transparency.png
diff --git a/sandbox/tests/test scenes/osl/ref/05 - object space.png b/sandbox/tests/test scenes/osl/ref/05 - object space.png
diff --git a/sandbox/tests/test scenes/osl/ref/06 - closure mix.png b/sandbox/tests/test scenes/osl/ref/06 - closure mix.png
diff --git a/sandbox/tests/test scenes/osl/ref/08 - point velocity.png b/sandbox/tests/test scenes/osl/ref/08 - point velocity.png
diff --git a/sandbox/tests/test scenes/osl/ref/09 - simple texture.png b/sandbox/tests/test scenes/osl/ref/09 - simple texture.png
diff --git a/sandbox/tests/test scenes/osl/ref/10 - transparent shadows opaque obj.png b/sandbox/tests/test scenes/osl/ref/10 - transparent shadows opaque obj.png
diff --git a/sandbox/tests/test scenes/osl/ref/12 - surface area - ptne.png b/sandbox/tests/test scenes/osl/ref/12 - surface area - ptne.png
diff --git a/sandbox/tests/test scenes/osl/ref/13 - point velocity moving assembly.png b/sandbox/tests/test scenes/osl/ref/13 - point velocity moving assembly.png
diff --git a/sandbox/tests/test scenes/osl/ref/14 - matrix param.png b/sandbox/tests/test scenes/osl/ref/14 - matrix param.png
diff --git a/sandbox/tests/test scenes/osl/ref/15 - bump noise2d.png b/sandbox/tests/test scenes/osl/ref/15 - bump noise2d.png
diff --git a/sandbox/tests/test scenes/osl/ref/16 - rough glass.png b/sandbox/tests/test scenes/osl/ref/16 - rough glass.png
diff --git a/sandbox/tests/test scenes/osl/ref/17 - bump texture.png b/sandbox/tests/test scenes/osl/ref/17 - bump texture.png
diff --git a/sandbox/tests/test scenes/osl/ref/18 - bump noise3d.png b/sandbox/tests/test scenes/osl/ref/18 - bump noise3d.png
diff --git a/sandbox/tests/test scenes/osl/ref/19 - bump noise2d diffuse only.png b/sandbox/tests/test scenes/osl/ref/19 - bump noise2d diffuse only.png
diff --git a/sandbox/tests/test scenes/osl/ref/20 - appleseed osl texture match.png b/sandbox/tests/test scenes/osl/ref/20 - appleseed osl texture match.png
diff --git a/sandbox/tests/test scenes/osl/ref/21 - appleseed osl translucent match.png b/sandbox/tests/test scenes/osl/ref/21 - appleseed osl translucent match.png
diff --git a/sandbox/tests/test scenes/osl/ref/23 - osl derivatives.png b/sandbox/tests/test scenes/osl/ref/23 - osl derivatives.png
diff --git a/sandbox/tests/test scenes/osl/ref/24 - osl bump pt nee.png b/sandbox/tests/test scenes/osl/ref/24 - osl bump pt nee.png
diff --git a/src/appleseed.shaders/CMakeLists.txt b/src/appleseed.shaders/CMakeLists.txt
@@ -138,17 +138,6 @@ source_group ("include\\appleseed\\pattern" FILES
     ${include_appleseed_pattern_sources}
 )
 
-set (include_alshaders_sources
-    include/alshaders/remap.h
-    include/alshaders/space.h
-)
-list (APPEND osl_headers
-    ${include_alshaders_sources}
-)
-source_group ("include\\alshaders" FILES
-    ${include_alshaders_sources}
-)
-
 
 #--------------------------------------------------------------------------------------------------
 # Source files.
@@ -385,35 +374,6 @@ source_group ("src\\maya" FILES
     ${src_maya_sources}
 )
 
-set (src_alshaders_sources
-    #src/alshaders/alBlackbody.osl
-    #src/alshaders/alCellNoise.osl
-    src/alshaders/alColorSpace.osl
-    src/alshaders/alCombineColor.osl
-    src/alshaders/alCombineFloat.osl
-    #src/alshaders/alCurvature.osl
-    #src/alshaders/alFlake.osl
-    src/alshaders/alFlowNoise.osl
-    src/alshaders/alFractal.osl
-    src/alshaders/alJitterColor.osl
-    src/alshaders/alLayerColor.osl
-    src/alshaders/alLayerFloat.osl
-    src/alshaders/alLayer.osl
-    src/alshaders/alPattern.osl
-    src/alshaders/alRemapColor.osl
-    src/alshaders/alRemapFloat.osl
-    src/alshaders/alSurface.osl
-    src/alshaders/alSwitchColor.osl
-    src/alshaders/alSwitchFloat.osl
-    #src/alshaders/alTriplanar.osl
-)
-list (APPEND osl_sources
-    ${src_alshaders_sources}
-)
-source_group ("src\\alshaders" FILES
-    ${src_alshaders_sources}
-)
-
 set (src_appleseed_sources
      src/appleseed/asDisneyMaterial.osl
      src/appleseed/asGlass.osl