Adding the minimal amount of changes to support Gaffer 0.56.x.x

boberfly · Mar 29, 2020 · ff0fc03 · ff0fc03
1 parent 5a7a583
commit ff0fc03
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -60,7 +60,7 @@
 
 parser.add_argument(
 	"--gafferVersion",
-	default = "0.55.4.0",
+	default = "0.56.1.0",
 	help = "The version of Gaffer to build against. "
 )
 

diff --git a/build_docker_optix.sh b/build_docker_optix.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python build.py --version 0.18.0 --cyclesVersion 0.17.0 --optix 1 --docker 1 --experimental 0 --upload 0 $@
+python build.py --version 0.18.1 --cyclesVersion 0.17.0 --optix 1 --docker 1 --experimental 0 --upload 0 $@
diff --git a/include/GafferCycles/CyclesLight.h b/include/GafferCycles/CyclesLight.h
@@ -41,6 +41,7 @@
 #include "GafferCycles/TypeIds.h"
 
 #include "GafferScene/Light.h"
+#include "Gaffer/Version.h"
 
 namespace GafferCycles
 {
@@ -60,7 +61,11 @@ class GAFFERCYCLES_API CyclesLight : public GafferScene::Light
 	protected :
 
 		void hashLight( const Gaffer::Context *context, IECore::MurmurHash &h ) const override;
+#ifdef GAFFER_MAJOR_VERSION >= 56
+		IECoreScene::ConstShaderNetworkPtr computeLight( const Gaffer::Context *context ) const override;
+#else
 		IECoreScene::ShaderNetworkPtr computeLight( const Gaffer::Context *context ) const override;
+#endif
 
 	private :
 

diff --git a/src/GafferCycles/CyclesLight.cpp b/src/GafferCycles/CyclesLight.cpp
@@ -102,7 +102,11 @@ void CyclesLight::hashLight( const Gaffer::Context *context, IECore::MurmurHash
 	shaderNamePlug()->hash( h );
 }
 
+#ifdef GAFFER_MAJOR_VERSION >= 56
+IECoreScene::ConstShaderNetworkPtr CyclesLight::computeLight( const Gaffer::Context *context ) const
+#else
 IECoreScene::ShaderNetworkPtr CyclesLight::computeLight( const Gaffer::Context *context ) const
+#endif
 {
 	IECoreScene::ShaderNetworkPtr result = new IECoreScene::ShaderNetwork;
 	// Light shader