diff --git a/Changes b/Changes index 70cc0cb379..fbb5e6a114 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,8 @@ +1.5.0 +----- + +- Cortex : Updated to 10.0.0-a79. + 1.4.1 ----- diff --git a/Cortex/config.py b/Cortex/config.py index 972eef85f9..f56ea61ac7 100644 --- a/Cortex/config.py +++ b/Cortex/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://github.com/ImageEngine/cortex/archive/10.0.0-a76.tar.gz" + "https://github.com/ImageEngine/cortex/archive/10.0.0-a79.tar.gz" ], @@ -12,7 +12,7 @@ "dependencies" : [ "Python", "OpenImageIO", "IlmBase", "PyIlmBase", "Boost", "OpenShadingLanguage", - "Blosc", "FreeType", "GLEW", "Appleseed", "TBB", "OpenVDB", "USD" + "Blosc", "FreeType", "GLEW", "Appleseed", "TBB", "OpenVDB", "USD", "Six" ], "environment" : { diff --git a/Cortex/patches/0001-IECoreGL-Shader-Support-3D-samplers.patch b/Cortex/patches/0001-IECoreGL-Shader-Support-3D-samplers.patch deleted file mode 100644 index 6ba3bbfad1..0000000000 --- a/Cortex/patches/0001-IECoreGL-Shader-Support-3D-samplers.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/IECoreGL/Shader.cpp b/src/IECoreGL/Shader.cpp -index 207c12077..bc2d3f7ca 100644 ---- a/src/IECoreGL/Shader.cpp -+++ b/src/IECoreGL/Shader.cpp -@@ -181,7 +181,7 @@ class Shader::Implementation : public IECore::RefCounted - } - } - -- if( p.type == GL_SAMPLER_2D ) -+ if( p.type == GL_SAMPLER_2D || p.type == GL_SAMPLER_3D ) - { - // we assign a specific texture unit to each individual - // sampler parameter - this makes it much easier to save - diff --git a/build.py b/build.py index e682d390c0..2e5f12ec01 100755 --- a/build.py +++ b/build.py @@ -15,7 +15,7 @@ import tarfile import zipfile -__version = "1.4.1" +__version = "1.5.0" def __projects() :