Remove Disney Material

CMakeLists.txt

@@ -131,7 +131,6 @@ option (WITH_BENCH                          "Build appleseed.bench"
 option (WITH_TOOLS                          "Build appleseed tools"                                     ON)
 option (WITH_PYTHON2_BINDINGS               "Build Python bindings for Python 2"                        ON)
 option (WITH_PYTHON3_BINDINGS               "Build Python bindings for Python 3"                        OFF)
-option (WITH_DISNEY_MATERIAL                "Build Disney material"                                     OFF)
 option (WITH_EMBREE                         "Include support for Embree intersection backend"           OFF)
 option (WITH_GPU                            "Build GPU support"                                         OFF)
 option (WITH_SPECTRAL_SUPPORT               "Include support for spectral colors"                       ON)
@@ -147,7 +146,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     option (USE_FIND_PACKAGE_FOR_OCIO       "Use find_package() for OpenColorIO library"                OFF)
     option (USE_FIND_PACKAGE_FOR_OIIO       "Use find_package() for OpenImageIO library"                OFF)
     option (USE_FIND_PACKAGE_FOR_OSL        "Use find_package() for OpenShadingLanguage library"        OFF)
-    option (USE_FIND_PACKAGE_FOR_SEEXPR     "Use find_package() for SeExpr library"                     OFF)
     option (USE_FIND_PACKAGE_FOR_XERCES     "Use find_package() for Xerces library"                     OFF)
     option (USE_FIND_PACKAGE_FOR_ZLIB       "Use find_package() for zlib library"                       OFF)
 else ()
@@ -158,7 +156,6 @@ else ()
     set (USE_FIND_PACKAGE_FOR_OIIO          ON)
     set (USE_FIND_PACKAGE_FOR_OSL           ON)
     set (USE_FIND_PACKAGE_FOR_PNG           ON)
-    set (USE_FIND_PACKAGE_FOR_SEEXPR        ON)
     set (USE_FIND_PACKAGE_FOR_XERCES        ON)
     set (USE_FIND_PACKAGE_FOR_ZLIB          ON)
 endif ()
@@ -323,17 +320,6 @@ if (USE_FIND_PACKAGE_FOR_PNG)
     find_package (PNG REQUIRED)
 endif ()
 
-if (WITH_DISNEY_MATERIAL)
-    set (APPLESEED_WITH_DISNEY_MATERIAL ON)
-    add_definitions (-DAPPLESEED_WITH_DISNEY_MATERIAL)
-    if (USE_FIND_PACKAGE_FOR_SEEXPR)
-        find_package (SeExpr REQUIRED)
-        if (WITH_STUDIO)
-            find_package (SeExprEditor REQUIRED)
-        endif ()
-    endif ()
-endif ()
-
 if (USE_FIND_PACKAGE_FOR_XERCES)
     add_definitions (-DAPPLESEED_WITH_EXTERNAL_XERCES)
     find_package (Xerces REQUIRED)
@@ -404,17 +390,6 @@ else ()
     include_directories (${APPLESEED_DEPS_STAGE_DIR}/osl-debug/include)
 endif ()
 
-if (WITH_DISNEY_MATERIAL)
-    if (USE_FIND_PACKAGE_FOR_SEEXPR)
-        include_directories (${SEEXPR_INCLUDE_DIRS})
-        if (WITH_STUDIO)
-            include_directories (${SEEXPREDITOR_INCLUDE_DIRS})
-        endif ()
-    else ()
-        include_directories (${APPLESEED_DEPS_STAGE_DIR}/SeExpr-debug/include)
-    endif ()
-endif ()
-
 if (USE_FIND_PACKAGE_FOR_XERCES)
     include_directories (${XERCES_INCLUDE_DIRS})
 else ()

THIRDPARTIES.txt

@@ -1663,31 +1663,6 @@ License:
 ------------------------------------------------------------------------------
 
 
-SeExpr
-https://www.disneyanimation.com/technology/seexpr.html
-
-License:
-
-
-    Copyright Disney Enterprises, Inc.  All rights reserved.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License
-    and the following modification to it: Section 6 Trademarks.
-    deleted and replaced with:
-
-    6. Trademarks. This License does not grant permission to use the
-    trade names, trademarks, service marks, or product names of the
-    Licensor and its affiliates, except as required for reproducing
-    the content of the NOTICE file.
-
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-
-
-------------------------------------------------------------------------------
-
-
 Xerces-C++
 https://xerces.apache.org/xerces-c/
 

cmake/config/linux-gcc-clang.txt

@@ -201,14 +201,6 @@ macro (link_against_osl target)
     target_link_libraries (${target} ${OSL_EXEC_LIBRARY} ${OSL_COMP_LIBRARY} ${OSL_QUERY_LIBRARY})
 endmacro ()
 
-macro (link_against_seexpr target)
-    target_link_libraries (${target} ${SEEXPR_LIBRARIES})
-endmacro ()
-
-macro (link_against_seexpreditor target)
-    target_link_libraries (${target} ${SEEXPREDITOR_LIBRARIES})
-endmacro ()
-
 macro (link_against_xercesc target)
     target_link_libraries (${target} ${XERCES_LIBRARIES})
 endmacro ()

cmake/config/mac-clang.txt

@@ -148,14 +148,6 @@ macro (link_against_osl target)
     target_link_libraries (${target} ${OSL_EXEC_LIBRARY} ${OSL_COMP_LIBRARY} ${OSL_QUERY_LIBRARY})
 endmacro ()
 
-macro (link_against_seexpr target)
-    target_link_libraries (${target} ${SEEXPR_LIBRARIES})
-endmacro ()
-
-macro (link_against_seexpreditor target)
-    target_link_libraries (${target} ${SEEXPREDITOR_LIBRARIES})
-endmacro ()
-
 macro (link_against_xercesc target)
     target_link_libraries (${target} ${XERCES_LIBRARIES})
 endmacro ()

cmake/config/win-vs.txt

@@ -351,28 +351,6 @@ macro (link_against_osl target)
     endif ()
 endmacro ()
 
-macro (link_against_seexpr target)
-    if (USE_FIND_PACKAGE_FOR_SEEXPR)
-        target_link_libraries (${target} ${SEEXPR_LIBRARIES})
-    else ()
-        target_link_libraries (${target}
-            debug       ${APPLESEED_DEPS_STAGE_DIR}/seexpr-debug/lib/SeExpr.lib
-            optimized   ${APPLESEED_DEPS_STAGE_DIR}/seexpr-release/lib/SeExpr.lib
-        )
-    endif ()
-endmacro ()
-
-macro (link_against_seexpreditor target)
-    if (USE_FIND_PACKAGE_FOR_SEEXPR)
-        target_link_libraries (${target} ${SEEXPREDITOR_LIBRARIES})
-    else ()
-        target_link_libraries (${target}
-            debug       ${APPLESEED_DEPS_STAGE_DIR}/seexpr-debug/lib/SeExprEditor.lib
-            optimized   ${APPLESEED_DEPS_STAGE_DIR}/seexpr-release/lib/SeExprEditor.lib
-        )
-    endif ()
-endmacro ()
-
 macro (link_against_xercesc target)
     if (USE_FIND_PACKAGE_FOR_XERCES)
         target_link_libraries (${target} ${XERCES_LIBRARIES})