Skip to content

Commit 1e5a777

Browse files
johnhaddonjohnhaddon
authored
Merge pull request #5257 from johnhaddon/removeAppleseed
Remove GafferAppleseed
2 parents 5237c3e + 9ae97ff commit 1e5a777

File tree

67 files changed

+25
-8500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+25
-8500
lines changed

‎.github/workflows/main/sconsOptions‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,4 @@ if sys.platform == "win32" :
6262
GLEW_LIB_SUFFIX = "32"
6363
INKSCAPE = "C:\\Program Files\\Inkscape\\bin\\inkscape.exe"
6464
WARNINGS_AS_ERRORS = False
65-
APPLESEED_ROOT = None
6665
SPHINX = "noSphinxYet"

‎Changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ API
3636
Breaking Changes
3737
----------------
3838

39+
- Appleseed : Removed Appleseed support. We suggest Cycles as an actively maintained open-source alternative.
3940
- GLWidget :
4041
- A GL context is no longer available in `_resize()`.
4142
- Removed `BufferOptions.Double`.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ With any luck, you now have a functioning version of Gaffer.
9696

9797
### Building with third-party renderer support
9898

99-
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:
99+
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:
100100

101101
- Arnold: `ARNOLD_ROOT`
102102
- 3Delight: `DELIGHT_ROOT`

‎SConstruct‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,6 @@ options.Add(
180180
# installed in some central location, rather than using the precompiled dependencies
181181
# provided by the GafferHQ/dependencies project.
182182

183-
options.Add(
184-
"APPLESEED_ROOT",
185-
"The directory in which Appleseed is installed. Used to build Gafferseed",
186-
os.path.join( "$BUILD_DIR", "appleseed" ),
187-
)
188-
189183
options.Add(
190184
"CYCLES_ROOT",
191185
"The directory in which Cycles is installed. Used to build GafferCycles",
@@ -234,12 +228,6 @@ options.Add(
234228
"",
235229
)
236230

237-
options.Add(
238-
"LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH",
239-
"The paths in which Appleseed resources are installed.",
240-
"",
241-
)
242-
243231
options.Add(
244232
"IMATH_LIB_SUFFIX",
245233
"The suffix used when locating the Imath library.",
@@ -1263,30 +1251,6 @@ libraries = {
12631251

12641252
"GafferDelightUITest" : {},
12651253

1266-
"GafferAppleseed" : {
1267-
"envAppends" : {
1268-
"CXXFLAGS" : [ systemIncludeArgument, "$APPLESEED_ROOT/include", "-DAPPLESEED_ENABLE_IMATH_INTEROP" ],
1269-
"LIBPATH" : [ "$APPLESEED_ROOT/lib" ],
1270-
"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" ],
1271-
"CPPDEFINES" : [ "APPLESEED_USE_SSE" ] if platform.machine() != "arm64" else [],
1272-
},
1273-
"pythonEnvAppends" : {
1274-
"CXXFLAGS" : [ systemIncludeArgument, "$APPLESEED_ROOT/include", "-DAPPLESEED_ENABLE_IMATH_INTEROP" ],
1275-
"LIBPATH" : [ "$APPLESEED_ROOT/lib" ],
1276-
"LIBS" : [ "Gaffer", "GafferDispatch", "GafferScene", "GafferBindings", "GafferAppleseed" ],
1277-
"CPPDEFINES" : [ "APPLESEED_USE_SSE" ] if platform.machine() != "arm64" else [],
1278-
},
1279-
"requiredOptions" : [ "APPLESEED_ROOT" ],
1280-
},
1281-
1282-
"GafferAppleseedTest" : {
1283-
"additionalFiles" : glob.glob( "python/GafferAppleseedTest/*/*" ),
1284-
},
1285-
1286-
"GafferAppleseedUI" : {},
1287-
1288-
"GafferAppleseedUITest" : {},
1289-
12901254
"GafferCycles" : {
12911255
"envAppends" : {
12921256
"LIBPATH" : [ "$CYCLES_ROOT/lib" ],
@@ -2095,7 +2059,7 @@ if haveSphinx and haveInkscape :
20952059
docCommandEnv["ENV"]["GAFFER_REFERENCE_PATHS"] = os.path.abspath( "doc/references" )
20962060
docCommandEnv["ENV"]["GAFFER_STARTUP_PATHS"] = os.path.abspath( "doc/startup" )
20972061

2098-
# Ensure that Arnold, Appleseed and 3delight are available in the documentation
2062+
# Ensure that Arnold and 3delight are available in the documentation
20992063
# environment.
21002064

21012065
libraryPathEnvVar = "DYLD_LIBRARY_PATH" if docEnv["PLATFORM"]=="darwin" else "LD_LIBRARY_PATH"
@@ -2105,13 +2069,6 @@ if haveSphinx and haveInkscape :
21052069
docCommandEnv["ENV"]["PYTHONPATH"] += ":" + docCommandEnv.subst( "$ARNOLD_ROOT/python" )
21062070
docCommandEnv["ENV"][libraryPathEnvVar] = docCommandEnv["ENV"].get( libraryPathEnvVar, "" ) + ":" + docCommandEnv.subst( "$ARNOLD_ROOT/bin" )
21072071

2108-
if docCommandEnv.subst( "$APPLESEED_ROOT" ) and docCommandEnv["APPLESEED_ROOT"] != "$BUILD_DIR/appleseed" :
2109-
docCommandEnv["ENV"]["PATH"] += ":" + docCommandEnv.subst( "$APPLESEED_ROOT/bin" )
2110-
docCommandEnv["ENV"][libraryPathEnvVar] = docCommandEnv["ENV"].get( libraryPathEnvVar, "" ) + ":" + docCommandEnv.subst( "$APPLESEED_ROOT/lib" )
2111-
docCommandEnv["ENV"]["OSLHOME"] = docCommandEnv.subst( "$OSLHOME" )
2112-
docCommandEnv["ENV"]["OSL_SHADER_PATHS"] = docCommandEnv.subst( "$APPLESEED_ROOT/shaders/appleseed" )
2113-
docCommandEnv["ENV"]["APPLESEED_SEARCHPATH"] = docCommandEnv.subst( "$APPLESEED_ROOT/shaders/appleseed:$LOCATE_DEPENDENCY_APPLESEED_SEARCHPATH" )
2114-
21152072
# Docs graphics generation
21162073
docGraphicsCommands = graphicsCommands( docEnv, "resources/docGraphics.svg", "$BUILD_DIR/doc/gaffer/graphics" )
21172074
docEnv.Alias( "docs", docGraphicsCommands )

‎bin/gaffer‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -198,36 +198,6 @@ export QT_XCB_TABLET_LEGACY_COORDINATES=1
198198

199199
prependToPath "$GAFFER_ROOT/bin" PATH
200200

201-
# Set up Appleseed
202-
##########################################################################
203-
204-
if [[ -z $APPLESEED && -d $GAFFER_ROOT/appleseed ]] ; then
205-
206-
export APPLESEED="$GAFFER_ROOT/appleseed"
207-
208-
fi
209-
210-
if [[ $APPLESEED ]] ; then
211-
212-
if [[ `uname` = "Linux" ]] ; then
213-
prependToPath "$APPLESEED/lib" LD_LIBRARY_PATH
214-
else
215-
prependToPath "$APPLESEED/lib" DYLD_LIBRARY_PATH
216-
fi
217-
218-
# Using a glob to keep the wrapper agnostic of python version.
219-
for appleseedPython in "$APPLESEED"/lib/python* ; do
220-
prependToPath "$appleseedPython" PYTHONPATH
221-
done
222-
223-
prependToPath "$APPLESEED/shaders/appleseed" OSL_SHADER_PATHS
224-
prependToPath "$GAFFER_ROOT/appleseedDisplays" APPLESEED_SEARCHPATH
225-
prependToPath "$OSL_SHADER_PATHS" APPLESEED_SEARCHPATH
226-
227-
prependToPath "$APPLESEED/bin" PATH
228-
229-
fi
230-
231201
# Set up Cycles
232202
##########################################################################
233203

‎bin/gaffer.cmd‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,6 @@ if "%OCIO%" EQU "" (
5252
set OCIO=%GAFFER_ROOT%\openColorIO\config.ocio
5353
)
5454

55-
rem Appleseed
56-
rem if "%APPLESEED%" == "" (
57-
rem if EXIST "%GAFFER_ROOT%"\appleseed (
58-
rem set APPLESEED=%GAFFER_ROOT%\appleseed
59-
rem )
60-
rem )
61-
62-
rem if "%APPLESEED%" NEQ "" (
63-
rem call :prependToPath "%APPLESEED%\shaders\gaffer" OSL_SHADER_PATHS
64-
rem call :prependToPath "%APPLESEED%\shaders\appleseed" OSL_SHADER_PATHS
65-
rem )
66-
67-
rem if "%APPLESEED%" NEQ "" (
68-
rem call :prependToPath "%APPLESEED%\bin;%APPLESEED%\lib" PATH
69-
rem call :prependToPath "%APPLESEED%\lib\python2.7" PYTHONPATH
70-
rem call :prependToPath "%OSL_SHADER_PATHS%;%GAFFER_ROOT%\appleseedDisplays" APPLESEED_SEARCHPATH
71-
rem )
72-
7355
rem Arnold
7456
if "%ARNOLD_ROOT%" NEQ "" (
7557
call :appendToPath "%ARNOLD_ROOT%\bin" PATH

‎config/validateRelease.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
requiredPaths.append( os.path.join( "python", module ) )
9090
requiredPaths.append( os.path.join( "python", "%sUI" % module ) )
9191

92-
if os.name != "nt" :
93-
requiredPaths.append( os.path.join( "python", "GafferAppleseed" ) )
94-
requiredPaths.append( os.path.join( "python", "%sUI" % "GafferAppleseed" ) )
95-
9692
rawMembers = []
9793

9894
if args.archive.endswith( ".tar.gz" ) :

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

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import Gaffer
2+
import GafferCycles
23
import GafferImage
3-
import GafferOSL
44
import GafferScene
5-
import IECore
65
import imath
76

8-
Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 0, persistent=False )
9-
Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 54, persistent=False )
7+
Gaffer.Metadata.registerValue( parent, "serialiser:milestoneVersion", 1, persistent=False )
8+
Gaffer.Metadata.registerValue( parent, "serialiser:majorVersion", 3, persistent=False )
109
Gaffer.Metadata.registerValue( parent, "serialiser:minorVersion", 0, persistent=False )
1110
Gaffer.Metadata.registerValue( parent, "serialiser:patchVersion", 0, persistent=False )
1211

1312
__children = {}
1413

15-
parent["variables"].addChild( Gaffer.NameValuePlug( "image:catalogue:port", Gaffer.IntPlug( "value", defaultValue = 0, flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "imageCataloguePort" ) )
16-
parent["variables"].addChild( Gaffer.NameValuePlug( "project:name", Gaffer.StringPlug( "value", defaultValue = 'default', flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ), "projectName" ) )
17-
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" ) )
14+
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 ) )
15+
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 ) )
16+
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 ) )
1817
__children["mySurfaceShaders"] = Gaffer.Box( "mySurfaceShaders" )
1918
parent.addChild( __children["mySurfaceShaders"] )
2019
__children["mySurfaceShaders"].addChild( Gaffer.BoxIn( "BoxIn" ) )
@@ -40,15 +39,12 @@ __children["mySurfaceShaders"]["BoxIn2"].setup( Gaffer.Color3fPlug( "out", defau
4039
__children["mySurfaceShaders"]["BoxIn2"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
4140
__children["mySurfaceShaders"].addChild( Gaffer.Color3fPlug( "textures", defaultValue = imath.Color3f( 0.5, 0.5, 0.5 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
4241
__children["mySurfaceShaders"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
43-
__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_disney_material" ) )
44-
__children["mySurfaceShaders"]["as_disney_material"].loadShader( "as_disney_material" )
45-
__children["mySurfaceShaders"]["as_disney_material"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
46-
__children["mySurfaceShaders"].addChild( GafferOSL.OSLShader( "as_closure2surface" ) )
47-
__children["mySurfaceShaders"]["as_closure2surface"].loadShader( "as_closure2surface" )
48-
__children["mySurfaceShaders"]["as_closure2surface"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
42+
__children["mySurfaceShaders"].addChild( GafferCycles.CyclesShader( "principled_bsdf" ) )
43+
__children["mySurfaceShaders"]["principled_bsdf"].loadShader( "principled_bsdf" )
44+
__children["mySurfaceShaders"]["principled_bsdf"].addChild( Gaffer.V2fPlug( "__uiPosition", defaultValue = imath.V2f( 0, 0 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, ) )
4945
__children["defaultFormat"] = GafferImage.FormatPlug( "defaultFormat", defaultValue = GafferImage.Format( 1920, 1080, 1.000 ), flags = Gaffer.Plug.Flags.Default | Gaffer.Plug.Flags.Dynamic, )
5046
parent.addChild( __children["defaultFormat"] )
51-
parent["variables"]["imageCataloguePort"]["value"].setValue( 45739 )
47+
parent["variables"]["imageCataloguePort"]["value"].setValue( 38132 )
5248
Gaffer.Metadata.registerValue( parent["variables"]["imageCataloguePort"], 'readOnly', True )
5349
Gaffer.Metadata.registerValue( parent["variables"]["projectName"]["name"], 'readOnly', True )
5450
Gaffer.Metadata.registerValue( parent["variables"]["projectRootDirectory"]["name"], 'readOnly', True )
@@ -77,11 +73,11 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'descripti
7773
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'plugValueWidget:type', '' )
7874
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:spacing', 2.0 )
7975
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["out"], 'noduleLayout:section', 'bottom' )
80-
__children["mySurfaceShaders"]["Group"]["in"]["in0"].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
76+
__children["mySurfaceShaders"]["Group"]["in"][0].setInput( __children["mySurfaceShaders"]["BoxIn"]["out"] )
8177
__children["mySurfaceShaders"]["Group"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -3.59166431 ) )
8278
__children["mySurfaceShaders"]["ShaderAssignment"]["in"].setInput( __children["mySurfaceShaders"]["Group"]["out"] )
8379
__children["mySurfaceShaders"]["ShaderAssignment"]["filter"].setInput( __children["mySurfaceShaders"]["BoxIn1"]["out"] )
84-
__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["as_closure2surface"]["out"] )
80+
__children["mySurfaceShaders"]["ShaderAssignment"]["shader"].setInput( __children["mySurfaceShaders"]["principled_bsdf"]["out"]["BSDF"] )
8581
__children["mySurfaceShaders"]["ShaderAssignment"]["__uiPosition"].setValue( imath.V2f( -6.91914892, -11.7557259 ) )
8682
__children["mySurfaceShaders"]["BoxIn1"]["name"].setValue( 'filter' )
8783
__children["mySurfaceShaders"]["BoxIn1"]["__in"].setInput( __children["mySurfaceShaders"]["filter"] )
@@ -109,22 +105,16 @@ Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"],
109105
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'plugValueWidget:type', None )
110106
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'nodule:type', 'GafferUI::StandardNodule' )
111107
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"], 'noduleLayout:visible', True )
112-
__children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"].setInput( __children["mySurfaceShaders"]["textures"]["r"] )
113108
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
114109
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'noduleLayout:section', 'left' )
115110
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"], 'userDefault', None )
116-
__children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"].setInput( __children["mySurfaceShaders"]["textures"]["g"] )
117111
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
118112
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'noduleLayout:section', 'left' )
119113
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"], 'userDefault', None )
120-
__children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"].setInput( __children["mySurfaceShaders"]["textures"]["b"] )
121114
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
122115
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'noduleLayout:section', 'left' )
123116
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"], 'userDefault', None )
124-
__children["mySurfaceShaders"]["BoxIn2"]["out"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["r"] )
125-
__children["mySurfaceShaders"]["BoxIn2"]["out"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["g"] )
126-
__children["mySurfaceShaders"]["BoxIn2"]["out"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["__in"]["b"] )
127-
__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -52.9208488, 1.69414592 ) )
117+
__children["mySurfaceShaders"]["BoxIn2"]["__uiPosition"].setValue( imath.V2f( -55.1208496, 6.99414587 ) )
128118
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'noduleLayout:section', 'left' )
129119
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"], 'userDefault', None )
130120
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"],
144134
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'noduleLayout:section', 'left' )
145135
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'userDefault', None )
146136
Gaffer.Metadata.registerValue( __children["mySurfaceShaders"]["textures"]["b"], 'nodule:color', imath.Color3f( 0.246700004, 0.376199991, 0.469999999 ) )
147-
__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
148-
__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["r"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["r"] )
149-
__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["g"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["g"] )
150-
__children["mySurfaceShaders"]["as_disney_material"]["parameters"]["in_color"]["b"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"]["b"] )
151-
__children["mySurfaceShaders"]["as_disney_material"]["__uiPosition"].setValue( imath.V2f( -42.1361732, -12.9558535 ) )
152-
__children["mySurfaceShaders"]["as_closure2surface"]["parameters"]["in_input"].setInput( __children["mySurfaceShaders"]["as_disney_material"]["out"]["out_outColor"] )
153-
__children["mySurfaceShaders"]["as_closure2surface"]["__uiPosition"].setValue( imath.V2f( -24.5216961, -11.7557735 ) )
137+
__children["mySurfaceShaders"]["principled_bsdf"]["parameters"]["base_color"].setInput( __children["mySurfaceShaders"]["BoxIn2"]["out"] )
138+
__children["mySurfaceShaders"]["principled_bsdf"]["__uiPosition"].setValue( imath.V2f( -31.1645927, -11.7557268 ) )
154139

155140

156141
del __children

‎include/GafferAppleseed/AppleseedAttributes.h‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)