Remove GafferAppleseed

.github/workflows/main/sconsOptions

@@ -62,5 +62,4 @@ if sys.platform == "win32" :
 	GLEW_LIB_SUFFIX = "32"
 	INKSCAPE = "C:\\Program Files\\Inkscape\\bin\\inkscape.exe"
 	WARNINGS_AS_ERRORS = False
-	APPLESEED_ROOT = None
 	SPHINX = "noSphinxYet"

Changes.md

@@ -36,6 +36,7 @@ API
 Breaking Changes
 ----------------
 
+- Appleseed : Removed Appleseed support. We suggest Cycles as an actively maintained open-source alternative.
 - GLWidget :
   - A GL context is no longer available in `_resize()`.
   - Removed `BufferOptions.Double`.

README.md

@@ -96,7 +96,7 @@ With any luck, you now have a functioning version of Gaffer.
 
 ### Building with third-party renderer support
 
-Gaffer dependencies ships with Appleseed, but to build the modules for one of the other supported third-party renderers, you will need to set appropriate `scons` options pointing to your installation. The options are:
+Gaffer dependencies ships with Cycles, but to build the modules for one of the other supported third-party renderers, you will need to set appropriate `scons` options pointing to your installation. The options are:
 
 - Arnold: `ARNOLD_ROOT`
 - 3Delight: `DELIGHT_ROOT`

SConstruct

@@ -180,12 +180,6 @@ options.Add(
 # installed in some central location, rather than using the precompiled dependencies
 # provided by the GafferHQ/dependencies project.
 
-options.Add(
-	"APPLESEED_ROOT",
-	"The directory in which Appleseed is installed. Used to build Gafferseed",
-	os.path.join( "$BUILD_DIR", "appleseed" ),
-)
-
 options.Add(
 	"CYCLES_ROOT",
 	"The directory in which Cycles is installed. Used to build GafferCycles",
@@ -234,12 +228,6 @@ options.Add(
 	"",
 )
 
-options.Add(
-	"LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH",
-	"The paths in which Appleseed resources are installed.",
-	"",
-)
-
 options.Add(
 	"IMATH_LIB_SUFFIX",
 	"The suffix used when locating the Imath library.",
@@ -1263,30 +1251,6 @@ libraries = {
 
 	"GafferDelightUITest" : {},
 
-	"GafferAppleseed" : {
-		"envAppends" : {
-			"CXXFLAGS" : [ systemIncludeArgument, "$APPLESEED_ROOT/include", "-DAPPLESEED_ENABLE_IMATH_INTEROP" ],
-			"LIBPATH" : [ "$APPLESEED_ROOT/lib" ],
-			"LIBS" : [ "Gaffer", "GafferDispatch", "GafferScene", "appleseed",  "IECoreScene$CORTEX_LIB_SUFFIX", "IECoreAppleseed$CORTEX_LIB_SUFFIX", "OpenImageIO$OIIO_LIB_SUFFIX", "OpenImageIO_Util$OIIO_LIB_SUFFIX", "oslquery$OSL_LIB_SUFFIX", "boost_thread$BOOST_LIB_SUFFIX" ],
-			"CPPDEFINES" : [ "APPLESEED_USE_SSE" ] if platform.machine() != "arm64" else [],
-		},
-		"pythonEnvAppends" : {
-			"CXXFLAGS" : [ systemIncludeArgument, "$APPLESEED_ROOT/include", "-DAPPLESEED_ENABLE_IMATH_INTEROP" ],
-			"LIBPATH" : [ "$APPLESEED_ROOT/lib" ],
-			"LIBS" : [ "Gaffer", "GafferDispatch", "GafferScene", "GafferBindings", "GafferAppleseed" ],
-			"CPPDEFINES" : [ "APPLESEED_USE_SSE" ] if platform.machine() != "arm64" else [],
-		},
-		"requiredOptions" : [ "APPLESEED_ROOT" ],
-	},
-
-	"GafferAppleseedTest" : {
-		"additionalFiles" : glob.glob( "python/GafferAppleseedTest/*/*" ),
-	},
-
-	"GafferAppleseedUI" : {},
-
-	"GafferAppleseedUITest" : {},
-
 	"GafferCycles" : {
 		"envAppends" : {
 			"LIBPATH" : [ "$CYCLES_ROOT/lib" ],
@@ -2095,7 +2059,7 @@ if haveSphinx and haveInkscape :
 	docCommandEnv["ENV"]["GAFFER_REFERENCE_PATHS"] = os.path.abspath( "doc/references" )
 	docCommandEnv["ENV"]["GAFFER_STARTUP_PATHS"] = os.path.abspath( "doc/startup" )
 
-	# Ensure that Arnold, Appleseed and 3delight are available in the documentation
+	# Ensure that Arnold and 3delight are available in the documentation
 	# environment.
 
 	libraryPathEnvVar = "DYLD_LIBRARY_PATH" if docEnv["PLATFORM"]=="darwin" else "LD_LIBRARY_PATH"
@@ -2105,13 +2069,6 @@ if haveSphinx and haveInkscape :
 		docCommandEnv["ENV"]["PYTHONPATH"] += ":" + docCommandEnv.subst( "$ARNOLD_ROOT/python" )
 		docCommandEnv["ENV"][libraryPathEnvVar] = docCommandEnv["ENV"].get( libraryPathEnvVar, "" ) + ":" + docCommandEnv.subst( "$ARNOLD_ROOT/bin" )
 
-	if docCommandEnv.subst( "$APPLESEED_ROOT" ) and docCommandEnv["APPLESEED_ROOT"] != "$BUILD_DIR/appleseed" :
-		docCommandEnv["ENV"]["PATH"] += ":" + docCommandEnv.subst( "$APPLESEED_ROOT/bin" )
-		docCommandEnv["ENV"][libraryPathEnvVar] = docCommandEnv["ENV"].get( libraryPathEnvVar, "" ) + ":" + docCommandEnv.subst( "$APPLESEED_ROOT/lib" )
-		docCommandEnv["ENV"]["OSLHOME"] = docCommandEnv.subst( "$OSLHOME" )
-		docCommandEnv["ENV"]["OSL_SHADER_PATHS"] = docCommandEnv.subst( "$APPLESEED_ROOT/shaders/appleseed" )
-		docCommandEnv["ENV"]["APPLESEED_SEARCHPATH"] = docCommandEnv.subst( "$APPLESEED_ROOT/shaders/appleseed:$LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH" )
-
 	#  Docs graphics generation
 	docGraphicsCommands = graphicsCommands( docEnv, "resources/docGraphics.svg", "$BUILD_DIR/doc/gaffer/graphics" )
 	docEnv.Alias( "docs", docGraphicsCommands )

bin/gaffer

@@ -198,36 +198,6 @@ export QT_XCB_TABLET_LEGACY_COORDINATES=1
 
 prependToPath "$GAFFER_ROOT/bin" PATH
 
-# Set up Appleseed
-##########################################################################
-
-if [[ -z $APPLESEED && -d $GAFFER_ROOT/appleseed ]] ; then
-
-	export APPLESEED="$GAFFER_ROOT/appleseed"
-
-fi
-
-if [[ $APPLESEED ]] ; then
-
-	if [[ `uname` = "Linux" ]] ; then
-		prependToPath "$APPLESEED/lib" LD_LIBRARY_PATH
-	else
-		prependToPath "$APPLESEED/lib" DYLD_LIBRARY_PATH
-	fi
-
-	# Using a glob to keep the wrapper agnostic of python version.
-	for appleseedPython in "$APPLESEED"/lib/python* ; do
-		prependToPath "$appleseedPython" PYTHONPATH
-	done
-
-	prependToPath "$APPLESEED/shaders/appleseed" OSL_SHADER_PATHS
-	prependToPath "$GAFFER_ROOT/appleseedDisplays" APPLESEED_SEARCHPATH
-	prependToPath "$OSL_SHADER_PATHS" APPLESEED_SEARCHPATH
-
-	prependToPath "$APPLESEED/bin" PATH
-
-fi
-
 # Set up Cycles
 ##########################################################################
 

bin/gaffer.cmd

@@ -52,24 +52,6 @@ if "%OCIO%" EQU "" (
 	set OCIO=%GAFFER_ROOT%\openColorIO\config.ocio
 )
 
-rem Appleseed
-rem if "%APPLESEED%" == "" (
-rem 	if EXIST "%GAFFER_ROOT%"\appleseed (
-rem 		set APPLESEED=%GAFFER_ROOT%\appleseed
-rem 	)
-rem )
-
-rem if "%APPLESEED%" NEQ "" (
-rem 	call :prependToPath "%APPLESEED%\shaders\gaffer" OSL_SHADER_PATHS
-rem 	call :prependToPath "%APPLESEED%\shaders\appleseed" OSL_SHADER_PATHS
-rem )
-
-rem if "%APPLESEED%" NEQ "" (
-rem 	call :prependToPath "%APPLESEED%\bin;%APPLESEED%\lib" PATH
-rem 	call :prependToPath "%APPLESEED%\lib\python2.7" PYTHONPATH
-rem 	call :prependToPath "%OSL_SHADER_PATHS%;%GAFFER_ROOT%\appleseedDisplays" APPLESEED_SEARCHPATH
-rem )
-
 rem Arnold
 if "%ARNOLD_ROOT%" NEQ "" (
 	call :appendToPath "%ARNOLD_ROOT%\bin" PATH

config/validateRelease.py

@@ -89,10 +89,6 @@
 	requiredPaths.append( os.path.join( "python", module ) )
 	requiredPaths.append( os.path.join( "python", "%sUI" % module ) )
 
-if os.name != "nt" :
-	requiredPaths.append( os.path.join( "python", "GafferAppleseed" ) )
-	requiredPaths.append( os.path.join( "python", "%sUI" % "GafferAppleseed" ) )
-
 rawMembers = []
 
 if args.archive.endswith( ".tar.gz" ) :

doc/source/WorkingWithTheNodeGraph/BoxNode/scripts/illustrationBoxReferences.gfr

@@ -1,20 +1,19 @@
 import Gaffer
+import GafferCycles
 import GafferImage
-import GafferOSL
 import GafferScene
-import IECore
 import imath
 
-Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 0, persistent=False )
-Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 54, persistent=False )
+Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 1, persistent=False )
+Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 3, persistent=False )
 Gaffer.Metadata.registerValue( parent, "serialiser:minorVersion", 0, persistent=False )
 Gaffer.Metadata.registerValue( parent, "serialiser:patchVersion", 0, persistent=False )
 
 __children = {}
 
-parent["variables"].addChild( Gaffer.NameValuePlug( "image:catalogue:port", Gaffer.IntPlug( "value", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "imageCataloguePort" ) )
-parent["variables"].addChild( Gaffer.NameValuePlug( "project:name", Gaffer.StringPlug( "value", defaultValue = 'default', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectName" ) )
-parent["variables"].addChild( Gaffer.NameValuePlug( "project:rootDirectory", Gaffer.StringPlug( "value", defaultValue = '$HOME/gaffer/projects/${project:name}', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectRootDirectory" ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "image:catalogue:port", Gaffer.IntPlug( "value", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "imageCataloguePort", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "project:name", Gaffer.StringPlug( "value", defaultValue = 'default', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectName", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
+parent["variables"].addChild( Gaffer.NameValuePlug( "project:rootDirectory", Gaffer.StringPlug( "value", defaultValue = '$HOME/gaffer/projects/${project:name}', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectRootDirectory", Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic ) )
 __children["mySurfaceShaders"] = Gaffer.Box( "mySurfaceShaders" )
 parent.addChild( __children["mySurfaceShaders"] )
 __children["mySurfaceShaders"].addChild( Gaffer.BoxIn( "BoxIn" ) )
@@ -40,15 +39,12 @@ __children["mySurfaceShaders"]["BoxIn2"].setup( Gaffer.Color3fPlug( "out", defau
 __children["mySurfaceShaders"]["BoxIn2"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["mySurfaceShaders"].addChild( Gaffer.Color3fPlug( "textures", defaultValue = imath.Color3f( 0.5, 0.5, 0.5 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["mySurfaceShaders"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
-__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_disney_material" ) )
-__children["mySurfaceShaders"]["as_disney_material"].loadShader( "as_disney_material" )
-__children["mySurfaceShaders"]["as_disney_material"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
-__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_closure2surface" ) )
-__children["mySurfaceShaders"]["as_closure2surface"].loadShader( "as_closure2surface" )
-__children["mySurfaceShaders"]["as_closure2surface"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
+__children["mySurfaceShaders"].addChild( GafferCycles.CyclesShader( "principled_bsdf" ) )
+__children["mySurfaceShaders"]["principled_bsdf"].loadShader( "principled_bsdf" )
+__children["mySurfaceShaders"]["principled_bsdf"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
 __children["defaultFormat"] = GafferImage.FormatPlug( "defaultFormat", defaultValue = GafferImage.Format( 1920, 1080, 1.000 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, )
 parent.addChild( __children["defaultFormat"] )
-parent["variables"]["imageCataloguePort"]["value"].setValue( 45739 )
+parent["variables"]["imageCataloguePort"]["value"].setValue( 38132 )
 Gaffer.Metadata.registerValue( parent["variables"]["imageCataloguePort"], 'readOnly', True )
 Gaffer.Metadata.registerValue( parent["variables"]["projectName"]["name"], 'readOnly', True )
 Gaffer.Metadata.registerValue( parent["variables"]["projectRootDirectory"]["name"], 'readOnly', True )
@@ -77,11 +73,11 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'descripti
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'plugValueWidget:type', '' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:spacing', 2.0 )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:section', 'bottom' )
-__children["mySurfaceShaders"]["Group"]["in"]["in0"].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
+__children["mySurfaceShaders"]["Group"]["in"][0].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
 __children["mySurfaceShaders"]["Group"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -3.59166431 ) )
 __children["mySurfaceShaders"]["ShaderAssignment"]["in"].setInput( __children["mySurfaceShaders"]["Group"]["out"] )
 __children["mySurfaceShaders"]["ShaderAssignment"]["filter"].setInput( __children["mySurfaceShaders"]["BoxIn1"]["out"] )
-__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["as_closure2surface"]["out"] )
+__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["principled_bsdf"]["out"]["BSDF"] )
 __children["mySurfaceShaders"]["ShaderAssignment"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -11.7557259 ) )
 __children["mySurfaceShaders"]["BoxIn1"]["name"].setValue( 'filter' )
 __children["mySurfaceShaders"]["BoxIn1"]["__in"].setInput( __children["mySurfaceShaders"]["filter"] )
@@ -109,22 +105,16 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"],
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'plugValueWidget:type', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'nodule:type', 'GafferUI::StandardNodule' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'noduleLayout:visible', True )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"].setInput( __children["mySurfaceShaders"]["textures"]["r"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"].setInput( __children["mySurfaceShaders"]["textures"]["g"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"].setInput( __children["mySurfaceShaders"]["textures"]["b"] )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'userDefault', None )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"] )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"] )
-__children["mySurfaceShaders"]["BoxIn2"]["out"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"] )
-__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -52.9208488, 1.69414592 ) )
+__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -55.1208496, 6.99414587 ) )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'userDefault', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'nodule:color', imath.Color3f( 0.689999998, 0.537800014, 0.228300005 ) )
@@ -144,13 +134,8 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["g"],
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'noduleLayout:section', 'left' )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'userDefault', None )
 Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["r"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["g"] )
-__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["b"] )
-__children["mySurfaceShaders"]["as_disney_material"]["__uiPosition"].setValue( imath.V2f( -42.1361732, -12.9558535 ) )
-__children["mySurfaceShaders"]["as_closure2surface"]["parameters"]["in_input"].setInput( __children["mySurfaceShaders"]["as_disney_material"]["out"]["out_outColor"] )
-__children["mySurfaceShaders"]["as_closure2surface"]["__uiPosition"].setValue( imath.V2f( -24.5216961, -11.7557735 ) )
+__children["mySurfaceShaders"]["principled_bsdf"]["parameters"]["base_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
+__children["mySurfaceShaders"]["principled_bsdf"]["__uiPosition"].setValue( imath.V2f( -31.1645927, -11.7557268 ) )
 
 
 del __children