Update to 0.11.0

boberfly · boberfly · commit 647d36ddcd24 · 2019-11-14T04:44:58.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ dependencies/*/archives
 dependencies/*/working
 .directory
 .vscode
+NVIDIA-OptiX-SDK*
diff --git a/build.py b/build.py
@@ -60,7 +60,7 @@
 
 parser.add_argument(
 	"--gafferVersion",
-	default = "0.54.2.0",
+	default = "0.54.2.1",
 	help = "The version of Gaffer to build against. "
 )
 
diff --git a/build_docker.sh b/build_docker.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python build.py --version 0.10.2 --cyclesVersion 0.10.0 --docker 1 --upload 0 $@
+python build.py --version 0.11.0 --cyclesVersion 0.11.0 --docker 1 --upload 0 $@
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.10.2 --cyclesVersion 0.10.0 --optix 1 --docker 1 --upload 0 $@
+python build.py --version 0.11.0 --cyclesVersion 0.11.0 --optix 1 --docker 1 --upload 0 $@
diff --git a/cycles b/cycles
@@ -1 +1 @@
-Subproject commit 3d4696736294563cce8bc1053b9e36e2f72e92e3
+Subproject commit fd55676179a2d9846c1df3bd9d1aade727e99f95

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`
`61`	`61`	`parser.add_argument(`
`62`	`62`	`"--gafferVersion",`
`63`		`- default = "0.54.2.0",`
	`63`	`+ default = "0.54.2.1",`
`64`	`64`	`help = "The version of Gaffer to build against. "`
`65`	`65`	`)`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`
`3`		`-python build.py --version 0.10.2 --cyclesVersion 0.10.0 --docker 1 --upload 0 $@`
	`3`	`+python build.py --version 0.11.0 --cyclesVersion 0.11.0 --docker 1 --upload 0 $@`