diff --git a/build/buildCortex.sh b/build/buildCortex.sh index 2956e144f6..1e04fbac89 100755 --- a/build/buildCortex.sh +++ b/build/buildCortex.sh @@ -5,7 +5,7 @@ set -e mkdir -p $BUILD_DIR/resources/cortex cp `dirname $0`/../tileset_2048.dat $BUILD_DIR/resources/cortex -cd `dirname $0`/../cortex-9.6.0 +cd `dirname $0`/../cortex-9.7.0 mkdir -p $BUILD_DIR/doc/licenses cp LICENSE $BUILD_DIR/doc/licenses/cortex diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h deleted file mode 100644 index 649ce8e1bb..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h +++ /dev/null @@ -1,75 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDCAMERACONVERTER_H -#define IECOREARNOLD_TOARNOLDCAMERACONVERTER_H - -#include "IECoreArnold/ToArnoldConverter.h" -#include "IECoreArnold/Export.h" - -namespace IECore -{ -IE_CORE_FORWARDDECLARE( Camera ); -} // namespace IECore - -namespace IECoreArnold -{ - -class IECOREARNOLD_API ToArnoldCameraConverter : public ToArnoldConverter -{ - - public : - - typedef IECore::Camera InputType; - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldCameraConverter, ToArnoldCameraConverterTypeId, ToArnoldConverter ); - - ToArnoldCameraConverter( IECore::CameraPtr toConvert ); - virtual ~ToArnoldCameraConverter(); - - protected : - - virtual AtNode *doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const; - - private : - - static ConverterDescription g_description; - -}; - -IE_CORE_DECLAREPTR( ToArnoldCameraConverter ); - -} // namespace IECoreArnold - -#endif // IECOREARNOLD_TOARNOLDCAMERACONVERTER_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h deleted file mode 100644 index edbc724aeb..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h +++ /dev/null @@ -1,130 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDCONVERTER_H -#define IECOREARNOLD_TOARNOLDCONVERTER_H - -#include "ai.h" - -#include "IECoreArnold/TypeIds.h" -#include "IECoreArnold/Export.h" - -#include "IECore/FromCoreConverter.h" -#include "IECore/CompoundData.h" - -namespace IECoreArnold -{ - -IE_CORE_FORWARDDECLARE( ToArnoldConverter ); - -/// A base class for all classes which convert from an IECore datatype -/// to an Arnold node. -class IECOREARNOLD_API ToArnoldConverter : public IECore::FromCoreConverter -{ - - public : - - /// This typedef describes the input object type for the converter. - /// Derived classes /must/ override this typedef to more accurately - /// describe their particular conversion in detail - it is used by - /// the ConverterDescription to correctly register the converter - /// with the factory mechanism. - typedef IECore::Object InputType; - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldConverter, ToArnoldConverterTypeId, IECore::FromCoreConverter ); - - /// Performs the conversion, returning an Arnold node representing the - /// input object. - AtNode *convert() const; - - /// \todo Do these belong somewhere else? - static void setParameter( AtNode *node, const AtParamEntry *parameter, const IECore::Data *value ); - static void setParameter( AtNode *node, const char *name, const IECore::Data *value ); - static void setParameters( AtNode *node, const IECore::CompoundDataMap &values ); - - /// \todo Even if setParameter belongs here, perhaps getParameter belongs on - /// a FromArnoldConverter? - static IECore::DataPtr getParameter( AtNode *node, const AtParamEntry *parameter ); - static IECore::DataPtr getParameter( AtNode *node, const AtUserParamEntry *parameter ); - static IECore::DataPtr getParameter( AtNode *node, const char *name ); - static void getParameters( AtNode *node, IECore::CompoundDataMap &values ); - - /// Returns the Arnold parameter type (AI_TYPE_INT etc) suitable for - /// storing Cortex data of the specified type, setting array to true - /// or false depending on whether or not the Arnold type will be an - /// array. Returns AI_TYPE_NONE if there is no suitable Arnold type. - static int parameterType( IECore::TypeId dataType, bool &array ); - - static AtArray *dataToArray( const IECore::Data *data ); - - /// Creates a suitable ToArnoldConverter operating on the specified object. - static ToArnoldConverterPtr create( IECore::ObjectPtr object ); - - protected: - - ToArnoldConverter( const std::string &description, IECore::TypeId supportedType ); - - virtual ~ToArnoldConverter(); - - /// Must be implemented by derived classes to perform the conversion. It is guaranteed that the object - /// is of the supported type and the parameter values have been validated and placed in operands. - virtual AtNode *doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const = 0; - - /// Creating a static instance of one of these (templated on your Converter type) - /// within your class will register your converter with the factory mechanism. - template - class ConverterDescription - { - public : - ConverterDescription(); - private : - static ToArnoldConverterPtr creator( IECore::ObjectPtr object ); - }; - - private : - - typedef ToArnoldConverterPtr (*CreatorFn)( IECore::ObjectPtr ); - typedef std::map CreatorMap; - static CreatorMap &creators(); - - static void setParameterInternal( AtNode *node, const char *name, int parameterType, bool array, const IECore::Data *value ); - static IECore::DataPtr getParameterInternal( AtNode *node, const char *name, int parameterType ); - -}; - -} // namespace IECoreArnold - -#include "IECoreArnold/ToArnoldConverter.inl" - -#endif // IECOREARNOLD_TOARNOLDCONVERTER_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl deleted file mode 100644 index 196351f612..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl +++ /dev/null @@ -1,55 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDCONVERTER_INL -#define IECOREARNOLD_TOARNOLDCONVERTER_INL - -namespace IECoreArnold -{ - -template -ToArnoldConverter::ConverterDescription::ConverterDescription() -{ - creators()[T::InputType::staticTypeId()] = &creator; -}; - -template -ToArnoldConverterPtr ToArnoldConverter::ConverterDescription::creator( IECore::ObjectPtr object ) -{ - return new T( boost::static_pointer_cast( object ) ); -} - -} // namespace IECoreArnold - -#endif // IECOREARNOLD_TOARNOLDCONVERTER_INL diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h deleted file mode 100644 index 40f5640cc7..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h +++ /dev/null @@ -1,75 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDCURVESCONVERTER_H -#define IECOREARNOLD_TOARNOLDCURVESCONVERTER_H - -#include "IECoreArnold/ToArnoldShapeConverter.h" -#include "IECoreArnold/Export.h" - -namespace IECore -{ -IE_CORE_FORWARDDECLARE( CurvesPrimitive ); -} // namespace IECore - -namespace IECoreArnold -{ - -class IECOREARNOLD_API ToArnoldCurvesConverter : public ToArnoldShapeConverter -{ - - public : - - typedef IECore::CurvesPrimitive InputType; - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldCurvesConverter, ToArnoldCurvesConverterTypeId, ToArnoldShapeConverter ); - - ToArnoldCurvesConverter( IECore::CurvesPrimitivePtr toConvert ); - virtual ~ToArnoldCurvesConverter(); - - protected : - - virtual AtNode *doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const; - - private : - - static ConverterDescription g_description; - -}; - -IE_CORE_DECLAREPTR( ToArnoldCurvesConverter ); - -} // namespace IECoreArnold - -#endif // IECOREARNOLD_TOARNOLDCURVESCONVERTER_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h deleted file mode 100644 index a150003280..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h +++ /dev/null @@ -1,77 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDMESHCONVERTER_H -#define IECOREARNOLD_TOARNOLDMESHCONVERTER_H - -#include "IECoreArnold/ToArnoldShapeConverter.h" -#include "IECoreArnold/Export.h" - -namespace IECore -{ -IE_CORE_FORWARDDECLARE( MeshPrimitive ); -} // namespace IECore - -namespace IECoreArnold -{ - -class IECOREARNOLD_API ToArnoldMeshConverter : public ToArnoldShapeConverter -{ - - public : - - typedef IECore::MeshPrimitive InputType; - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldMeshConverter, ToArnoldMeshConverterTypeId, ToArnoldShapeConverter ); - - ToArnoldMeshConverter( IECore::MeshPrimitivePtr toConvert ); - virtual ~ToArnoldMeshConverter(); - - protected : - - virtual AtNode *doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const; - - private : - - static AtArray *faceVaryingIndices( const IECore::MeshPrimitive *mesh ); - - static ConverterDescription g_description; - -}; - -IE_CORE_DECLAREPTR( ToArnoldMeshConverter ); - -} // namespace IECoreArnold - -#endif // IECOREARNOLD_TOARNOLDMESHCONVERTER_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h b/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h deleted file mode 100644 index ae03d4964b..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h +++ /dev/null @@ -1,45 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#ifndef IECOREARNOLD_TOARNOLDSHAPECONVERTERBINDING_H -#define IECOREARNOLD_TOARNOLDSHAPECONVERTERBINDING_H - -namespace IECoreArnold -{ - -void bindToArnoldShapeConverter(); - -} // namespace IECoreArnold - -#endif // IECOREARNOLD_TOARNOLDSHAPECONVERTERBINDING_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp b/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp deleted file mode 100644 index 878cf8be94..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp +++ /dev/null @@ -1,197 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#include "ai.h" - -#include "IECore/VectorTypedData.h" -#include "IECore/SimpleTypedData.h" -#include "IECore/Primitive.h" -#include "IECore/MessageHandler.h" - -#include "IECoreArnold/ToArnoldShapeConverter.h" - -using namespace IECoreArnold; -using namespace IECore; -using namespace std; - -IE_CORE_DEFINERUNTIMETYPED( ToArnoldShapeConverter ); - -ToArnoldShapeConverter::ToArnoldShapeConverter( const std::string &description, IECore::TypeId supportedType ) - : ToArnoldConverter( description, supportedType ) -{ -} - -ToArnoldShapeConverter::~ToArnoldShapeConverter() -{ -} - -void ToArnoldShapeConverter::convertP( const IECore::V3fVectorData *p, AtNode *shape, const char *name ) const -{ - AiNodeSetArray( - shape, - name, - AiArrayConvert( p->readable().size(), 1, AI_TYPE_POINT, (void *)&( p->readable()[0] ) ) - ); -} - -void ToArnoldShapeConverter::convertRadius( const IECore::Primitive *primitive, AtNode *shape ) const -{ - ConstFloatVectorDataPtr radius = primitive->variableData( "radius" ); - if( !radius ) - { - FloatVectorDataPtr calculatedRadius = new FloatVectorData(); - if( const FloatData *constantRadius = primitive->variableData( "radius", PrimitiveVariable::Constant ) ) - { - calculatedRadius->writable().push_back( constantRadius->readable() ); - } - else if( const FloatVectorData *width = primitive->variableData( "width" ) ) - { - calculatedRadius->writable().resize( width->readable().size() ); - const std::vector::iterator end = calculatedRadius->writable().end(); - std::vector::const_iterator wIt = width->readable().begin(); - for( std::vector::iterator it = calculatedRadius->writable().begin(); it != end; it++, wIt++ ) - { - *it = *wIt / 2.0f; - } - } - else - { - const FloatData *constantWidth = primitive->variableData( "width", PrimitiveVariable::Constant ); - if( !constantWidth ) - { - constantWidth = primitive->variableData( "constantwidth", PrimitiveVariable::Constant ); - } - float r = constantWidth ? constantWidth->readable() / 2.0f : 0.5f; - calculatedRadius->writable().push_back( r ); - } - radius = calculatedRadius; - } - - AiNodeSetArray( - shape, - "radius", - AiArrayConvert( radius->readable().size(), 1, AI_TYPE_FLOAT, (void *)&( radius->readable()[0] ) ) - ); -} - -void ToArnoldShapeConverter::convertPrimitiveVariable( const IECore::Primitive *primitive, const PrimitiveVariable &primitiveVariable, AtNode *shape, const char *name ) const -{ - if( primitiveVariable.interpolation == PrimitiveVariable::Constant ) - { - setParameter( shape, name, primitiveVariable.data.get() ); - } - else - { - bool isArray = false; - int type = parameterType( primitiveVariable.data->typeId(), isArray ); - if( type == AI_TYPE_NONE || !isArray ) - { - msg( - Msg::Warning, - "ToArnoldShapeConverter::convertPrimitiveVariable", - boost::format( "Unable to create user parameter \"%s\" for primitive variable of type \"%s\"" ) % name % primitiveVariable.data->typeName() - ); - return; - } - - std::string typeString; - if( primitiveVariable.interpolation == PrimitiveVariable::Uniform ) - { - typeString = "uniform "; - } - else if( primitiveVariable.interpolation == PrimitiveVariable::Vertex ) - { - typeString = "varying "; - } - else if( primitive->variableSize( primitiveVariable.interpolation ) == primitive->variableSize( PrimitiveVariable::Vertex ) ) - { - typeString = "varying "; - } - - if( typeString == "" ) - { - msg( - Msg::Warning, - "ToArnoldShapeConverter::convertPrimitiveVariable", - boost::format( "Unable to create user parameter \"%s\" because primitive variable has unsupported interpolation" ) % name - ); - return; - } - - typeString += AiParamGetTypeName( type ); - AiNodeDeclare( shape, name, typeString.c_str() ); - AtArray *array = dataToArray( primitiveVariable.data.get() ); - if( array ) - { - AiNodeSetArray( shape, name, array ); - } - else - { - msg( - Msg::Warning, - "ToArnoldShapeConverter::convertPrimitiveVariable", - boost::format( "Failed to create array for parameter \"%s\" from data of type \"%s\"" ) % name % primitiveVariable.data->typeName() - ); - } - } -} - -void ToArnoldShapeConverter::convertPrimitiveVariables( const IECore::Primitive *primitive, AtNode *shape, const char **namesToIgnore ) const -{ - for( PrimitiveVariableMap::const_iterator it = primitive->variables.begin(), eIt = primitive->variables.end(); it!=eIt; it++ ) - { - if( namesToIgnore ) - { - bool skip = false; - for( const char **n = namesToIgnore; *n; n++ ) - { - if( it->first == *n ) - { - skip = true; - break; - } - } - if( skip ) - { - continue; - } - } - - // we prefix all the names, as otherwise the chance of a conflict between - // an arbitrary primitive variable name and an existing arnold parameter name - // seems too great. - string prefixedName = "user:" + it->first; - convertPrimitiveVariable( primitive, it->second, shape, prefixedName.c_str() ); - } -} diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp b/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp deleted file mode 100644 index dc67a0219e..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp +++ /dev/null @@ -1,55 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#include "boost/python.hpp" - -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. -#include "ai.h" - -#include "IECoreArnold/ToArnoldCurvesConverter.h" -#include "IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h" - -#include "IECorePython/RunTimeTypedBinding.h" - -#include "IECore/CurvesPrimitive.h" - -using namespace boost::python; - -void IECoreArnold::bindToArnoldCurvesConverter() -{ - IECorePython::RunTimeTypedClass() - .def( init() ) - ; -} diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp b/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp deleted file mode 100644 index 4a93fc3edc..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp +++ /dev/null @@ -1,55 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#include "boost/python.hpp" - -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. -#include "ai.h" - -#include "IECoreArnold/ToArnoldMeshConverter.h" -#include "IECoreArnold/bindings/ToArnoldMeshConverterBinding.h" - -#include "IECorePython/RunTimeTypedBinding.h" - -#include "IECore/MeshPrimitive.h" - -using namespace boost::python; - -void IECoreArnold::bindToArnoldMeshConverter() -{ - IECorePython::RunTimeTypedClass() - .def( init() ) - ; -} diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp b/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp deleted file mode 100644 index 24177e368e..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp +++ /dev/null @@ -1,56 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#include "boost/python.hpp" - -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. -#include "ai.h" - -#include "IECoreArnold/ToArnoldPointsConverter.h" -#include "IECoreArnold/bindings/ToArnoldPointsConverterBinding.h" - -#include "IECorePython/RunTimeTypedBinding.h" - -#include "IECore/PointsPrimitive.h" - -using namespace IECoreArnold; -using namespace boost::python; - -void IECoreArnold::bindToArnoldPointsConverter() -{ - IECorePython::RunTimeTypedClass() - .def( init() ) - ; -} diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp b/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp deleted file mode 100644 index 2d57957ed2..0000000000 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp +++ /dev/null @@ -1,51 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * Neither the name of Image Engine Design nor the names of any -// other contributors to this software may be used to endorse or -// promote products derived from this software without specific prior -// written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////// - -#include "boost/python.hpp" - -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. -#include "ai.h" - -#include "IECoreArnold/ToArnoldShapeConverter.h" -#include "IECoreArnold/bindings/ToArnoldShapeConverterBinding.h" - -#include "IECorePython/RunTimeTypedBinding.h" - -using namespace boost::python; - -void IECoreArnold::bindToArnoldShapeConverter() -{ - IECorePython::RunTimeTypedClass(); -} diff --git a/cortex-9.6.0/.gitignore b/cortex-9.7.0/.gitignore similarity index 100% rename from cortex-9.6.0/.gitignore rename to cortex-9.7.0/.gitignore diff --git a/cortex-9.6.0/.travis.yml b/cortex-9.7.0/.travis.yml similarity index 100% rename from cortex-9.6.0/.travis.yml rename to cortex-9.7.0/.travis.yml diff --git a/cortex-9.6.0/Changes b/cortex-9.7.0/Changes similarity index 98% rename from cortex-9.6.0/Changes rename to cortex-9.7.0/Changes index c927b3a67f..c869701b45 100644 --- a/cortex-9.6.0/Changes +++ b/cortex-9.7.0/Changes @@ -1,3 +1,34 @@ +# 9.7.0 + +#### IECore + +- Fixed potential crash in MeshPrimitiveEvaluator::barycentricPosition() (#475). +- Fixed ConfigLoader to ignore duplicate paths. Note that this may change configuration + behaviour for malformed paths with duplicates (#474). + +#### IECoreArnold + +- Added support for both deformation and transform blur (#473). +- Refactored all Cortex->Arnold conversion functionality into new Algo.h headers, + removing the old FromCoreConverter based classes. This does represent a compatibilit + break, but IECoreArnold is in contrib, where no compatibility guarantees exist. +- Fixed warnings relating to the data type of Arnold's visibility parameter, which + has been changed to AtByte from AtInt. + +# 9.6.1 + +#### IECore + +- MessageHandler handles python exceptions before they get to c++ + +#### IECoreMaya + +- Sorting childNames during ieSceneShape expansion + +#### IECoreAppleseed + +- Added nested volume priority attribute + # 9.6.0 #### IECore diff --git a/cortex-9.6.0/LICENSE b/cortex-9.7.0/LICENSE similarity index 100% rename from cortex-9.6.0/LICENSE rename to cortex-9.7.0/LICENSE diff --git a/cortex-9.6.0/README.asciidoc b/cortex-9.7.0/README.asciidoc similarity index 100% rename from cortex-9.6.0/README.asciidoc rename to cortex-9.7.0/README.asciidoc diff --git a/cortex-9.6.0/SConstruct b/cortex-9.7.0/SConstruct similarity index 99% rename from cortex-9.6.0/SConstruct rename to cortex-9.7.0/SConstruct index 505ed03801..343e3493d3 100644 --- a/cortex-9.6.0/SConstruct +++ b/cortex-9.7.0/SConstruct @@ -51,7 +51,7 @@ EnsureSConsVersion( 0, 97 ) SConsignFile() ieCoreMajorVersion=9 -ieCoreMinorVersion=6 +ieCoreMinorVersion=7 ieCorePatchVersion=0 ieCoreVersionSuffix="" # used for alpha/beta releases. Example: "a1", "b2", etc. diff --git a/cortex-9.6.0/config/ie/buildAll b/cortex-9.7.0/config/ie/buildAll similarity index 100% rename from cortex-9.6.0/config/ie/buildAll rename to cortex-9.7.0/config/ie/buildAll diff --git a/cortex-9.6.0/config/ie/options b/cortex-9.7.0/config/ie/options similarity index 100% rename from cortex-9.6.0/config/ie/options rename to cortex-9.7.0/config/ie/options diff --git a/cortex-9.6.0/config/ie/postCoreHoudiniInstall b/cortex-9.7.0/config/ie/postCoreHoudiniInstall similarity index 100% rename from cortex-9.6.0/config/ie/postCoreHoudiniInstall rename to cortex-9.7.0/config/ie/postCoreHoudiniInstall diff --git a/cortex-9.6.0/config/ie/postCoreMayaInstall b/cortex-9.7.0/config/ie/postCoreMayaInstall similarity index 100% rename from cortex-9.6.0/config/ie/postCoreMayaInstall rename to cortex-9.7.0/config/ie/postCoreMayaInstall diff --git a/cortex-9.6.0/config/ie/valgrindSuppressions b/cortex-9.7.0/config/ie/valgrindSuppressions similarity index 100% rename from cortex-9.6.0/config/ie/valgrindSuppressions rename to cortex-9.7.0/config/ie/valgrindSuppressions diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/Export.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/Export.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/Export.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/Export.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h b/cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h rename to cortex-9.7.0/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py b/cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py rename to cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py b/cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py rename to cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py b/cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py rename to cortex-9.7.0/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp b/cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp rename to cortex-9.7.0/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/All.py b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/All.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/All.py rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/All.py diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/sphereWithShadingGroups.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/sphereWithShadingGroups.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/sphereWithShadingGroups.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/sphereWithShadingGroups.abc diff --git a/cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc b/cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc similarity index 100% rename from cortex-9.6.0/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc rename to cortex-9.7.0/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/Changes b/cortex-9.7.0/contrib/IECoreAppleseed/Changes similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/Changes rename to cortex-9.7.0/contrib/IECoreAppleseed/Changes diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/Renderer.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/Renderer.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/Renderer.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/Renderer.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedCameraConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedCameraConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedCameraConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedCameraConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.inl b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.inl similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.inl rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedConverter.inl diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedMeshConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedMeshConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedMeshConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedMeshConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedShapeConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedShapeConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedShapeConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/ToAppleseedShapeConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/TypeIds.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/TypeIds.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/TypeIds.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/TypeIds.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/RendererBinding.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/RendererBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/RendererBinding.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/RendererBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedConverterBinding.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedConverterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedConverterBinding.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedConverterBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AppleseedUtil.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AppleseedUtil.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AppleseedUtil.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AppleseedUtil.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h similarity index 98% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h index 5936026d30..8090e0da85 100644 --- a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h +++ b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/AttributeState.h @@ -63,6 +63,8 @@ class AttributeState bool photonTarget() const; + int volumePriority() const; + void attributesHash( IECore::MurmurHash &hash ) const; void addOSLShader( IECore::ConstShaderPtr shader ); @@ -86,6 +88,7 @@ class AttributeState std::string m_alphaMap; bool m_photonTarget; foundation::Dictionary m_visibilityDictionary; + int m_volumePriority; }; diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/BatchPrimitiveConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/BatchPrimitiveConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/BatchPrimitiveConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/BatchPrimitiveConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/EditBlockHandler.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/EditBlockHandler.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/EditBlockHandler.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/EditBlockHandler.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/InteractivePrimitiveConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/InteractivePrimitiveConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/InteractivePrimitiveConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/InteractivePrimitiveConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LightHandler.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LightHandler.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LightHandler.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LightHandler.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LogTarget.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LogTarget.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LogTarget.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/LogTarget.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/MotionBlockHandler.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/MotionBlockHandler.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/MotionBlockHandler.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/MotionBlockHandler.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/PrimitiveConverter.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/PrimitiveConverter.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/PrimitiveConverter.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/PrimitiveConverter.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererController.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererController.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererController.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererController.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererImplementation.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererImplementation.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererImplementation.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/RendererImplementation.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/ShadingState.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/ShadingState.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/ShadingState.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/ShadingState.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/TransformStack.h b/cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/TransformStack.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/TransformStack.h rename to cortex-9.7.0/contrib/IECoreAppleseed/include/IECoreAppleseed/private/TransformStack.h diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/python/IECoreAppleseed/__init__.py b/cortex-9.7.0/contrib/IECoreAppleseed/python/IECoreAppleseed/__init__.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/python/IECoreAppleseed/__init__.py rename to cortex-9.7.0/contrib/IECoreAppleseed/python/IECoreAppleseed/__init__.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AppleseedUtil.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AppleseedUtil.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AppleseedUtil.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AppleseedUtil.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp similarity index 92% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp index 683b349c5d..2339f2add3 100644 --- a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp +++ b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/AttributeState.cpp @@ -47,6 +47,7 @@ IECoreAppleseed::AttributeState::AttributeState() { m_attributes = new CompoundData; m_photonTarget = false; + m_volumePriority = 0; } IECoreAppleseed::AttributeState::AttributeState( const AttributeState &other ) @@ -57,6 +58,7 @@ IECoreAppleseed::AttributeState::AttributeState( const AttributeState &other ) m_alphaMap = other.m_alphaMap; m_photonTarget = other.m_photonTarget; m_visibilityDictionary = other.m_visibilityDictionary; + m_volumePriority = other.m_volumePriority; } void IECoreAppleseed::AttributeState::setAttribute( const string &name, ConstDataPtr value ) @@ -107,6 +109,17 @@ void IECoreAppleseed::AttributeState::setAttribute( const string &name, ConstDat msg( Msg::Error, "IECoreAppleseed::RendererImplementation::setAttribute", "photon_target attribute expect a BoolData value." ); } } + else if( name == "as:volume_priority" ) + { + if( const IntData *f = runTimeCast( value.get() ) ) + { + m_volumePriority = f->readable(); + } + else + { + msg( Msg::Error, "IECoreAppleseed::RendererImplementation::setAttribute", "as:volume_priority attribute expects an IntData value." ); + } + } else if( 0 == name.compare( 0, 14, "as:visibility:" ) ) { if( const BoolData *f = runTimeCast( value.get() ) ) @@ -146,10 +159,16 @@ bool IECoreAppleseed::AttributeState::photonTarget() const return m_photonTarget; } +int IECoreAppleseed::AttributeState::volumePriority() const +{ + return m_volumePriority; +} + void IECoreAppleseed::AttributeState::attributesHash( MurmurHash &hash ) const { hash.append( m_alphaMap ); hash.append( m_photonTarget ); + hash.append( m_volumePriority ); } void IECoreAppleseed::AttributeState::addOSLShader( ConstShaderPtr shader ) diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/BatchPrimitiveConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/BatchPrimitiveConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/BatchPrimitiveConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/BatchPrimitiveConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/EditBlockHandler.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/EditBlockHandler.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/EditBlockHandler.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/EditBlockHandler.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/InteractivePrimitiveConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/InteractivePrimitiveConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/InteractivePrimitiveConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/InteractivePrimitiveConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LightHandler.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LightHandler.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LightHandler.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LightHandler.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LogTarget.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LogTarget.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LogTarget.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/LogTarget.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/MotionBlockHandler.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/MotionBlockHandler.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/MotionBlockHandler.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/MotionBlockHandler.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp similarity index 98% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp index 9855418913..98bb8e9eee 100644 --- a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/PrimitiveConverter.cpp @@ -272,6 +272,11 @@ void IECoreAppleseed::PrimitiveConverter::createObjectInstance( asr::Assembly &a params.insert( "photon_target", "true" ); } + if( attrState.volumePriority() != 0 ) + { + params.insert( "volume_priority", attrState.volumePriority() ); + } + asf::auto_release_ptr objInstance = asr::ObjectInstanceFactory::create( instanceName.c_str(), params, objectEntityName( objSourceName ).c_str(), asf::Transformd::make_identity(), materials, materials ); assembly.object_instances().insert( objInstance ); diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/Renderer.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/Renderer.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/Renderer.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/Renderer.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/RendererImplementation.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/RendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/RendererImplementation.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/RendererImplementation.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ShadingState.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ShadingState.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ShadingState.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ShadingState.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedCameraConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedCameraConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedCameraConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedMeshConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedMeshConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedMeshConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedMeshConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedShapeConverter.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedShapeConverter.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedShapeConverter.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/ToAppleseedShapeConverter.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/TransformStack.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/TransformStack.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/TransformStack.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/TransformStack.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/IECoreAppleseedBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/IECoreAppleseedBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/IECoreAppleseedBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/IECoreAppleseedBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/RendererBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/RendererBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/RendererBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedCameraConverterBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedConverterBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedMeshConverterBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/bindings/ToAppleseedShapeConverterBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/DisplayTileCallback.cpp b/cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/DisplayTileCallback.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/DisplayTileCallback.cpp rename to cortex-9.7.0/contrib/IECoreAppleseed/src/IECoreAppleseed/outputDriver/DisplayTileCallback.cpp diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/All.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/All.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/All.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/All.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AppleseedTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AppleseedTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AppleseedTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AppleseedTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py similarity index 80% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py index 435673cad0..147687df8f 100644 --- a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py +++ b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/AttributeTest.py @@ -119,6 +119,40 @@ def testAlphaMaps( self ) : self.failIf( IECore.ImageDiffOp()( imageA=image, imageB=expectedImage, maxError=0.003 ).value ) + def testVolumePriorities( self ) : + + r = IECoreAppleseed.Renderer() + r.worldBegin() + + self._createDefaultShader( r ) + + m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) + + r.attributeBegin() + r.setAttribute( "name", IECore.StringData( "plane1" ) ) + r.setAttribute( "as:volume_priority", IECore.IntData( 4 ) ) + m.render( r ) + r.attributeEnd() + + r.attributeBegin() + r.setAttribute( "name", IECore.StringData( "plane2" ) ) + r.setAttribute( "as:volume_priority", IECore.IntData( 2 ) ) + m.render( r ) + r.attributeEnd() + + ass = self._getMainAssembly( r ) + + self.failUnless( len( ass.assemblies() ) == 2 ) + self.failUnless( len( ass.assembly_instances() ) == 2 ) + + objAss = ass.assemblies()["plane1_assembly"] + objInst = objAss.object_instances()[0] + self.failUnless( objInst.get_parameters()['volume_priority'] == 4 ) + + objAss = ass.assemblies()["plane2_assembly"] + objInst = objAss.object_instances()[0] + self.failUnless( objInst.get_parameters()['volume_priority'] == 2 ) + def testNestedAttributeBlock( self ) : r = IECoreAppleseed.Renderer() @@ -126,9 +160,11 @@ def testNestedAttributeBlock( self ) : r.attributeBegin() r.setAttribute( "name", IECore.StringData( "object_name" ) ) + r.setAttribute( "as:volume_priority", IECore.IntData( 7 ) ) r.attributeBegin() self.failUnless( r.getAttribute( "name" ) == IECore.StringData( "object_name" ) ) + self.failUnless( r.getAttribute( "as:volume_priority" ) == IECore.IntData( 7 ) ) if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/CameraTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/CameraTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/CameraTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/CameraTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/LightTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/LightTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/LightTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/LightTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MeshTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MeshTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MeshTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MeshTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MotionTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MotionTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MotionTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/MotionTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/PrimitiveConverterTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/PrimitiveConverterTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/PrimitiveConverterTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/PrimitiveConverterTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/RendererTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/RendererTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/RendererTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/RendererTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/ToAppleseedConverterTest.py b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/ToAppleseedConverterTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/ToAppleseedConverterTest.py rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/ToAppleseedConverterTest.py diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedAlphaMaps.exr b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedAlphaMaps.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedAlphaMaps.exr rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedAlphaMaps.exr diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedMeshUVs.exr b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedMeshUVs.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedMeshUVs.exr rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/referenceImages/expectedMeshUVs.exr diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.osl b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.osl similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.osl rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.osl diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.oso b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.oso similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.oso rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/glossy.oso diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.osl b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.osl similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.osl rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.osl diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.oso b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.oso similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.oso rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/shaders/matte.oso diff --git a/cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/textures/leaf.exr b/cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/textures/leaf.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/textures/leaf.exr rename to cortex-9.7.0/contrib/IECoreAppleseed/test/IECoreAppleseed/data/textures/leaf.exr diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CameraAlgo.h similarity index 85% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CameraAlgo.h index 60e177f997..d1c20a9cee 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CameraAlgo.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,14 +32,23 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDMESHCONVERTERBINDING_H -#define IECOREARNOLD_TOARNOLDMESHCONVERTERBINDING_H +#ifndef IECOREARNOLD_CAMERAALGO_H +#define IECOREARNOLD_CAMERAALGO_H + +#include "ai.h" + +#include "IECore/Camera.h" namespace IECoreArnold { -void bindToArnoldMeshConverter(); +namespace CameraAlgo +{ + +AtNode *convert( const IECore::Camera *camera ); + +} // namespace CameraAlgo } // namespace IECoreArnold -#endif // IECOREARNOLD_TOARNOLDMESHCONVERTERBINDING_H +#endif // IECOREARNOLD_CAMERAALGO_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CurvesAlgo.h similarity index 80% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CurvesAlgo.h index 3f03819fe1..d7051ba4c3 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/CurvesAlgo.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,14 +32,24 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDPOINTSCONVERTERBINDING_H -#define IECOREARNOLD_TOARNOLDPOINTSCONVERTERBINDING_H +#ifndef IECOREARNOLD_CURVESALGO_H +#define IECOREARNOLD_CURVESALGO_H + +#include "ai.h" + +#include "IECore/CurvesPrimitive.h" namespace IECoreArnold { -void bindToArnoldPointsConverter(); +namespace CurvesAlgo +{ + +AtNode *convert( const IECore::CurvesPrimitive *curves ); +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ); + +} // namespace CurvesAlgo } // namespace IECoreArnold -#endif // IECOREARNOLD_TOARNOLDPOINTSCONVERTERBINDING_H +#endif // IECOREARNOLD_CURVESALGO_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/Export.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/Export.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/Export.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/Export.h diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h similarity index 84% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h index 44270ccfa6..1451f46a6b 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h @@ -62,19 +62,19 @@ class IECOREARNOLD_API InstancingConverter : public IECore::RefCounted /// UniverseBlock. InstancingConverter(); virtual ~InstancingConverter(); - + /// Returns the Primitive converted to an appropriate AtNode type, returning - /// a ginstance if an identical primitive has already been processed. This version - /// of the function simply calls the version below using primitive->hash() - /// for the hash. + /// a ginstance if an identical primitive has already been processed. Primitive + /// identity is determined by comparing hashes. AtNode *convert( const IECore::Primitive *primitive ); - /// As above, but allowing the user to explicitly pass a hash uniquely - /// identifying the primitive. This is useful for systems which intend to - /// manipulate the primary (non-instanced) AtNodes which are returned - they - /// can append to the primitive hash to represent the post-processing they intend - /// to do. - AtNode *convert( const IECore::Primitive *primitive, const IECore::MurmurHash &hash ); - + /// As above, but allowing the user to pass an additional hash representing + /// modifications that will be made to the AtNode after conversion. + AtNode *convert( const IECore::Primitive *primitive, const IECore::MurmurHash &additionalHash ); + + /// Motion blurred versions of the above conversion functions. + AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ); + AtNode *convert( const std::vector &samples, const std::vector &sampleTimes, const IECore::MurmurHash &additionalHash ); + private : struct MemberData; diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/MeshAlgo.h similarity index 80% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/MeshAlgo.h index e87898938b..16d840ab25 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/MeshAlgo.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,14 +32,24 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDCURVESCONVERTERBINDING_H -#define IECOREARNOLD_TOARNOLDCURVESCONVERTERBINDING_H +#ifndef IECOREARNOLD_MESHALGO_H +#define IECOREARNOLD_MESHALGO_H + +#include "ai.h" + +#include "IECore/MeshPrimitive.h" namespace IECoreArnold { -void bindToArnoldCurvesConverter(); +namespace MeshAlgo +{ + +AtNode *convert( const IECore::MeshPrimitive *mesh ); +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ); + +} // namespace MeshAlgo } // namespace IECoreArnold -#endif // IECOREARNOLD_TOARNOLDCURVESCONVERTERBINDING_H +#endif // IECOREARNOLD_MESHALGO_H diff --git a/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/NodeAlgo.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/NodeAlgo.h new file mode 100644 index 0000000000..232fb5fe85 --- /dev/null +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/NodeAlgo.h @@ -0,0 +1,97 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// * Neither the name of Image Engine Design nor the names of any +// other contributors to this software may be used to endorse or +// promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +////////////////////////////////////////////////////////////////////////// + +#ifndef IECOREARNOLD_NODEALGO_H +#define IECOREARNOLD_NODEALGO_H + +#include "ai.h" + +#include "IECore/Object.h" + +namespace IECoreArnold +{ + +namespace NodeAlgo +{ + +/// Converts the specified IECore::Object into an equivalent +/// Arnold object, returning NULL if no conversion is +/// available. +AtNode *convert( const IECore::Object *object ); +/// Converts the specified IECore::Object samples into an +/// equivalent moving Arnold object. If no motion converter +/// is available, then returns a standard conversion of the +/// first sample. +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ); + +/// Signature of a function which can convert an IECore::Object +/// into an Arnold object. +typedef AtNode * (*Converter)( const IECore::Object * ); +/// Signature of a function which can convert a series of IECore::Object +/// samples into a moving Arnold object. +typedef AtNode * (*MotionConverter)( const std::vector &samples, const std::vector &sampleTimes ); + +/// Registers a converter for a specific type. +/// Use the ConverterDescription utility class in preference to +/// this, since it provides additional type safety. +void registerConverter( IECore::TypeId fromType, Converter converter, MotionConverter motionConverter = NULL ); + +/// Class which registers a converter for type T automatically +/// when instantiated. +template +class ConverterDescription +{ + + public : + + /// Type-specific conversion functions. + typedef AtNode *(*Converter)( const T * ); + typedef AtNode *(*MotionConverter)( const std::vector &, const std::vector & ); + + ConverterDescription( Converter converter, MotionConverter motionConverter = NULL ) + { + registerConverter( + T::staticTypeId(), + reinterpret_cast( converter ), + reinterpret_cast( motionConverter ) + ); + } + +}; + +} // namespace NodeAlgo + +} // namespace IECoreArnold + +#endif // IECOREARNOLD_NODEALGO_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ParameterAlgo.h similarity index 52% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ParameterAlgo.h index 746fcc4d06..512046f5af 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ParameterAlgo.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,50 +32,44 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDSHAPECONVERTER_H -#define IECOREARNOLD_TOARNOLDSHAPECONVERTER_H +#ifndef IECOREARNOLD_PARAMETERALGO_H +#define IECOREARNOLD_PARAMETERALGO_H -#include "IECore/VectorTypedData.h" +#include "ai.h" -#include "IECoreArnold/ToArnoldConverter.h" +#include "IECoreArnold/TypeIds.h" #include "IECoreArnold/Export.h" -namespace IECore -{ -IE_CORE_FORWARDDECLARE( Primitive ) -struct PrimitiveVariable; -} // namespace IECore +#include "IECore/CompoundData.h" namespace IECoreArnold { -class IECOREARNOLD_API ToArnoldShapeConverter : public ToArnoldConverter +namespace ParameterAlgo { - public : - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldShapeConverter, ToArnoldShapeConverterTypeId, ToArnoldConverter ); - - virtual ~ToArnoldShapeConverter(); - - protected : +IECOREARNOLD_API void setParameter( AtNode *node, const AtParamEntry *parameter, const IECore::Data *value ); +IECOREARNOLD_API void setParameter( AtNode *node, const char *name, const IECore::Data *value ); +IECOREARNOLD_API void setParameters( AtNode *node, const IECore::CompoundDataMap &values ); - ToArnoldShapeConverter( const std::string &description, IECore::TypeId supportedType ); +IECOREARNOLD_API IECore::DataPtr getParameter( AtNode *node, const AtParamEntry *parameter ); +IECOREARNOLD_API IECore::DataPtr getParameter( AtNode *node, const AtUserParamEntry *parameter ); +IECOREARNOLD_API IECore::DataPtr getParameter( AtNode *node, const char *name ); +IECOREARNOLD_API void getParameters( AtNode *node, IECore::CompoundDataMap &values ); - /// \todo I think we could deal with motion blur in here, by having the additional - /// samples either provided by velocity or P1, P2 etc primitive variables, or by having - /// additional samples specified via a Parameter. - void convertP( const IECore::V3fVectorData *p, AtNode *shape, const char *name ) const; - void convertRadius( const IECore::Primitive *primitive, AtNode *shape ) const; - void convertPrimitiveVariable( const IECore::Primitive *primitive, const IECore::PrimitiveVariable &primitiveVariable, AtNode *shape, const char *name ) const; - /// Converts primitive variables from primitive into user parameters on shape, ignoring any variables - /// whose names are present in the ignore array. - void convertPrimitiveVariables( const IECore::Primitive *primitive, AtNode *shape, const char **namesToIgnore=0 ) const; +/// Returns the Arnold parameter type (AI_TYPE_INT etc) suitable for +/// storing Cortex data of the specified type, setting array to true +/// or false depending on whether or not the Arnold type will be an +/// array. Returns AI_TYPE_NONE if there is no suitable Arnold type. +IECOREARNOLD_API int parameterType( IECore::TypeId dataType, bool &array ); -}; +/// If the equivalent Arnold type for the data is already known, then it may be passed directly. +/// If not it will be inferred using parameterType(). +IECOREARNOLD_API AtArray *dataToArray( const IECore::Data *data, int aiType = AI_TYPE_NONE ); +IECOREARNOLD_API AtArray *dataToArray( const std::vector &samples, int aiType = AI_TYPE_NONE ); -IE_CORE_DECLAREPTR( ToArnoldShapeConverter ); +} // namespace ParameterAlgo } // namespace IECoreArnold -#endif // IECOREARNOLD_TOARNOLDSHAPECONVERTER_H +#endif // IECOREARNOLD_PARAMETERALGO_H diff --git a/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/PointsAlgo.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/PointsAlgo.h new file mode 100644 index 0000000000..76f1f46d3d --- /dev/null +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/PointsAlgo.h @@ -0,0 +1,55 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// * Neither the name of Image Engine Design nor the names of any +// other contributors to this software may be used to endorse or +// promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +////////////////////////////////////////////////////////////////////////// + +#ifndef IECOREARNOLD_POINTSALGO_H +#define IECOREARNOLD_POINTSALGO_H + +#include "ai.h" + +#include "IECore/PointsPrimitive.h" + +namespace IECoreArnold +{ + +namespace PointsAlgo +{ + +AtNode *convert( const IECore::PointsPrimitive *points ); +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ); + +} // namespace PointsAlgo + +} // namespace IECoreArnold + +#endif // IECOREARNOLD_POINTSALGO_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h index 24392f2552..2d6e9aeee1 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/Renderer.h @@ -64,7 +64,7 @@ class IECOREARNOLD_API Renderer : public IECore::Renderer /// Makes a renderer which can be used for expanding the procedural /// passed as an argument. Renderer( const AtNode *proceduralNode ); - + virtual ~Renderer(); IE_CORE_DECLARERUNTIMETYPEDEXTENSION( IECoreArnold::Renderer, RendererTypeId, IECore::Renderer ); @@ -158,7 +158,7 @@ class IECOREARNOLD_API Renderer : public IECore::Renderer virtual void editBegin( const std::string &editType, const IECore::CompoundDataMap ¶meters ); virtual void editEnd(); - + /// May be called when this renderer is being used to run a procedural, to return the number of /// Arnold nodes created by the procedural. size_t numProceduralNodes() const; @@ -169,7 +169,7 @@ class IECOREARNOLD_API Renderer : public IECore::Renderer private : friend class RendererImplementation; - + Renderer( RendererImplementationPtr implementation ); RendererImplementationPtr m_implementation; diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ShapeAlgo.h similarity index 63% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ShapeAlgo.h index 8d27d3549c..764b20cf8b 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/ShapeAlgo.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,44 +32,32 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDPOINTSCONVERTER_H -#define IECOREARNOLD_TOARNOLDPOINTSCONVERTER_H +#ifndef IECOREARNOLD_SHAPEALGO_H +#define IECOREARNOLD_SHAPEALGO_H -#include "IECoreArnold/ToArnoldShapeConverter.h" -#include "IECoreArnold/Export.h" +#include "ai.h" -namespace IECore -{ -IE_CORE_FORWARDDECLARE( PointsPrimitive ); -} // namespace IECore +#include "IECore/Primitive.h" namespace IECoreArnold { -class IECOREARNOLD_API ToArnoldPointsConverter : public ToArnoldShapeConverter +namespace ShapeAlgo { - public : - - typedef IECore::PointsPrimitive InputType; - - IE_CORE_DECLARERUNTIMETYPEDEXTENSION( ToArnoldPointsConverter, ToArnoldPointsConverterTypeId, ToArnoldShapeConverter ); - - ToArnoldPointsConverter( IECore::PointsPrimitivePtr toConvert ); - virtual ~ToArnoldPointsConverter(); - - protected : - - virtual AtNode *doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const; - - private : +void convertP( const IECore::Primitive *primitive, AtNode *shape, const char *name ); +void convertP( const std::vector &samples, AtNode *shape, const char *name ); - static ConverterDescription g_description; +void convertRadius( const IECore::Primitive *primitive, AtNode *shape ); +void convertRadius( const std::vector &samples, AtNode *shape ); -}; +void convertPrimitiveVariable( const IECore::Primitive *primitive, const IECore::PrimitiveVariable &primitiveVariable, AtNode *shape, const char *name ); +/// Converts primitive variables from primitive into user parameters on shape, ignoring any variables +/// whose names are present in the ignore array. +void convertPrimitiveVariables( const IECore::Primitive *primitive, AtNode *shape, const char **namesToIgnore=NULL ); -IE_CORE_DECLAREPTR( ToArnoldPointsConverter ); +} // namespace ShapeAlgo } // namespace IECoreArnold -#endif // IECOREARNOLD_TOARNOLDPOINTSCONVERTER_H +#endif // IECOREARNOLD_SHAPEALGO_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h index c865d94245..2c775c17b6 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h @@ -48,7 +48,7 @@ enum TypeId ToArnoldCurvesConverterTypeId = 114004, ToArnoldPointsConverterTypeId = 114005, ToArnoldShapeConverterTypeId = 114006, - + LastCoreArnoldTypeId = 114999, }; diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h index 59eb941c93..a23334bd41 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h @@ -56,7 +56,7 @@ class IECOREARNOLD_API UniverseBlock : public boost::noncopyable /// Calls AiEnd() when the number of destructor calls /// matches the number of constructor calls. ~UniverseBlock(); - + }; } // namespace IECoreArnold diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/NodeAlgoBinding.h similarity index 86% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/NodeAlgoBinding.h index 403e1c4747..eac38a0ecc 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/NodeAlgoBinding.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,18 +32,18 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREARNOLD_TOARNOLDCONVERTERBINDING_H -#define IECOREARNOLD_TOARNOLDCONVERTERBINDING_H +#ifndef IECOREARNOLD_NODEALGOBINDING_H +#define IECOREARNOLD_NODEALGOBINDING_H #include "boost/python.hpp" #include "ai.h" -namespace IECoreArnold +namespace IECoreArnoldBindings { boost::python::object atNodeToPythonObject( AtNode *node ); -void bindToArnoldConverter(); +void bindNodeAlgo(); -} // namespace IECoreArnold +} // namespace IECoreArnoldBindings -#endif // IECOREARNOLD_TOARNOLDCONVERTERBINDING_H +#endif // IECOREARNOLD_NODEALGOBINDING_H diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h diff --git a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h similarity index 96% rename from cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h rename to cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h index b5992c23c2..154daa9913 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h +++ b/cortex-9.7.0/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h @@ -40,6 +40,8 @@ #include "ai.h" +#include "IECore/private/TransformStack.h" + #include "IECoreArnold/Renderer.h" #include "IECoreArnold/UniverseBlock.h" #include "IECoreArnold/InstancingConverter.h" @@ -60,7 +62,7 @@ class RendererImplementation : public IECore::Renderer // Initialises transform and attribute stacks from proceduralNode - used to // create an appropriate context for the cortex procedural DSO. RendererImplementation( const AtNode *proceduralNode ); - + virtual ~RendererImplementation(); virtual void setOption( const std::string &name, IECore::ConstDataPtr value ); @@ -119,24 +121,25 @@ class RendererImplementation : public IECore::Renderer virtual void editBegin( const std::string &editType, const IECore::CompoundDataMap ¶meters ); virtual void editEnd(); - + private : - + enum Mode { AssGen, Render, Procedural }; - + void constructCommon( Mode mode ); - + + bool automaticInstancing() const; void addPrimitive( const IECore::Primitive *primitive, const std::string &attributePrefix ); void addShape( AtNode *shape ); void applyTransformToNode( AtNode *node ); void applyVisibilityToNode( AtNode *node ); void addNode( AtNode *node ); - + // this is what we use in the userptr for procedurals. it contains // the procedural we wish to render, and a renderer which contains the // state at the point the procedural was emitted. @@ -145,60 +148,63 @@ class RendererImplementation : public IECore::Renderer IECore::Renderer::ProceduralPtr procedural; RendererPtr renderer; }; - + static int procLoader( AtProcVtable *vTable ); static int procInit( AtNode *node, void **userPtr ); static int procCleanup( void *userPtr ); static int procNumNodes( void *userPtr ); static AtNode *procGetNode( void *userPtr, int i ); - + boost::shared_ptr m_universe; InstancingConverterPtr m_instancingConverter; - + Mode m_mode; std::string m_assFileName; - + // created in constructor. AtNode *m_defaultFilter; - + // built by the display() method, and passed to the arnold global options in worldBegin(). std::vector m_outputDescriptions; - - // transform stack stuff - typedef std::stack TransformStack; - TransformStack m_transformStack; - + + // transform stack + IECore::TransformStack m_transformStack; + // attribute stack stuff class AttributeState { - + public : - + AttributeState(); AttributeState( const AttributeState &other ); - + AtNode *surfaceShader; AtNode *displacementShader; - + // shaders specified using "shader" or "ai:shader" type. // these are used as input connections to other shaders. typedef std::map ShaderMap; ShaderMap shaders; - + IECore::CompoundDataPtr attributes; - + }; - + typedef std::stack AttributeStack; AttributeStack m_attributeStack; - + + // motion blur stuff + std::vector m_motionTimes; + std::vector m_motionPrimitives; + // list of nodes that have been output so far. we have // to collect this so we can support dripfeeding nodes to // arnold one by one in procedurals. std::vector m_nodes; - + friend class IECoreArnold::Renderer; - + }; } // namespace IECoreArnold diff --git a/cortex-9.6.0/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py b/cortex-9.7.0/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py rename to cortex-9.7.0/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py diff --git a/cortex-9.6.0/contrib/IECoreArnold/python/IECoreArnold/__init__.py b/cortex-9.7.0/contrib/IECoreArnold/python/IECoreArnold/__init__.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/python/IECoreArnold/__init__.py rename to cortex-9.7.0/contrib/IECoreArnold/python/IECoreArnold/__init__.py diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CameraAlgo.cpp similarity index 61% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CameraAlgo.cpp index 28dc6ea702..99a93f4532 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CameraAlgo.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2011-2016, Image Engine Design Inc. All rights reserved. // Copyright (c) 2012, John Haddon. All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -33,44 +33,36 @@ // ////////////////////////////////////////////////////////////////////////// -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. #include "ai.h" #include "IECore/Camera.h" #include "IECore/SimpleTypedData.h" -#include "IECoreArnold/ToArnoldCameraConverter.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/CameraAlgo.h" -using namespace IECoreArnold; using namespace IECore; +using namespace IECoreArnold; -IE_CORE_DEFINERUNTIMETYPED( ToArnoldCameraConverter ); - -ToArnoldCameraConverter::ConverterDescription ToArnoldCameraConverter::g_description; - -ToArnoldCameraConverter::ToArnoldCameraConverter( IECore::CameraPtr toConvert ) - : ToArnoldConverter( "Converts IECore::Cameras to arnold camera nodes", IECore::Camera::staticTypeId() ) +namespace { - srcParameter()->setValue( toConvert ); -} -ToArnoldCameraConverter::~ToArnoldCameraConverter() -{ -} +NodeAlgo::ConverterDescription g_description( CameraAlgo::convert ); + +} // namespace -AtNode *ToArnoldCameraConverter::doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const +AtNode *CameraAlgo::convert( const IECore::Camera *camera ) { - CameraPtr camera = boost::static_pointer_cast( from )->copy(); - camera->addStandardParameters(); + CameraPtr cameraCopy = camera->copy(); + cameraCopy->addStandardParameters(); // use projection to decide what sort of camera node to create - const std::string &projection = camera->parametersData()->member( "projection", true )->readable(); + const std::string &projection = cameraCopy->parametersData()->member( "projection", true )->readable(); AtNode *result = 0; if( projection=="perspective" ) { result = AiNode( "persp_camera" ); - AiNodeSetFlt( result, "fov", camera->parametersData()->member( "projection:fov", true )->readable() ); + AiNodeSetFlt( result, "fov", cameraCopy->parametersData()->member( "projection:fov", true )->readable() ); } else if( projection=="orthographic" ) { @@ -80,24 +72,24 @@ AtNode *ToArnoldCameraConverter::doConversion( IECore::ConstObjectPtr from, IECo { result = AiNode( projection.c_str() ); } - + // set clipping planes - const Imath::V2f &clippingPlanes = camera->parametersData()->member( "clippingPlanes", true )->readable(); + const Imath::V2f &clippingPlanes = cameraCopy->parametersData()->member( "clippingPlanes", true )->readable(); AiNodeSetFlt( result, "near_clip", clippingPlanes[0] ); AiNodeSetFlt( result, "far_clip", clippingPlanes[1] ); - + // set shutter - const Imath::V2f &shutter = camera->parametersData()->member( "shutter", true )->readable(); + const Imath::V2f &shutter = cameraCopy->parametersData()->member( "shutter", true )->readable(); AiNodeSetFlt( result, "shutter_start", shutter[0] ); AiNodeSetFlt( result, "shutter_end", shutter[1] ); - + // set screen window - const Imath::Box2f &screenWindow = camera->parametersData()->member( "screenWindow", true )->readable(); - const Imath::V2i &resolution = camera->parametersData()->member( "resolution", true )->readable(); - const float pixelAspectRatio = camera->parametersData()->member( "pixelAspectRatio", true )->readable(); + const Imath::Box2f &screenWindow = cameraCopy->parametersData()->member( "screenWindow", true )->readable(); + const Imath::V2i &resolution = cameraCopy->parametersData()->member( "resolution", true )->readable(); + const float pixelAspectRatio = cameraCopy->parametersData()->member( "pixelAspectRatio", true )->readable(); float aspect = pixelAspectRatio * (float)resolution.x / (float)resolution.y; AiNodeSetPnt2( result, "screen_window_min", screenWindow.min.x, screenWindow.min.y * aspect ); AiNodeSetPnt2( result, "screen_window_max", screenWindow.max.x, screenWindow.max.y * aspect ); - + return result; } diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CurvesAlgo.cpp similarity index 68% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CurvesAlgo.cpp index 0cd0288d8e..1a863cbcc1 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/CurvesAlgo.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2011-2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -38,39 +38,27 @@ #include "IECore/CurvesPrimitive.h" #include "IECore/Exception.h" -#include "IECore/SimpleTypedData.h" -#include "IECoreArnold/ToArnoldCurvesConverter.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/ShapeAlgo.h" +#include "IECoreArnold/CurvesAlgo.h" -using namespace IECoreArnold; -using namespace IECore; using namespace std; +using namespace IECore; +using namespace IECoreArnold; -IE_CORE_DEFINERUNTIMETYPED( ToArnoldCurvesConverter ); - -ToArnoldCurvesConverter::ConverterDescription ToArnoldCurvesConverter::g_description; +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// -ToArnoldCurvesConverter::ToArnoldCurvesConverter( IECore::CurvesPrimitivePtr toConvert ) - : ToArnoldShapeConverter( "Converts IECore::CurvesPrimitives to arnold curves nodes", IECore::CurvesPrimitive::staticTypeId() ) +namespace { - srcParameter()->setValue( toConvert ); -} -ToArnoldCurvesConverter::~ToArnoldCurvesConverter() -{ -} +NodeAlgo::ConverterDescription g_description( CurvesAlgo::convert, CurvesAlgo::convert ); -AtNode *ToArnoldCurvesConverter::doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const +AtNode *convertCommon( const IECore::CurvesPrimitive *curves ) { - const CurvesPrimitive *curves = static_cast( from.get() ); - const V3fVectorData *p = curves->variableData( "P", PrimitiveVariable::Vertex ); - if( !p ) - { - throw Exception( "CurvesPrimitive does not have \"P\" primitive variable of interpolation type Vertex." ); - } - - // make the result curves and add points - + AtNode *result = AiNode( "curves" ); const std::vector verticesPerCurve = curves->verticesPerCurve()->readable(); @@ -80,10 +68,8 @@ AtNode *ToArnoldCurvesConverter::doConversion( IECore::ConstObjectPtr from, IECo AiArrayConvert( verticesPerCurve.size(), 1, AI_TYPE_INT, (void *)&( verticesPerCurve[0] ) ) ); - convertP( p, result, "points" ); - // set basis - + if( curves->basis() == CubicBasisf::bezier() ) { AiNodeSetStr( result, "basis", "bezier" ); @@ -104,15 +90,37 @@ AtNode *ToArnoldCurvesConverter::doConversion( IECore::ConstObjectPtr from, IECo { // just accept the default } - - // add radius - - convertRadius( curves, result ); // add arbitrary user parameters - + const char *ignore[] = { "P", "width", "radius", 0 }; - convertPrimitiveVariables( curves, result, ignore ); - + ShapeAlgo::convertPrimitiveVariables( curves, result, ignore ); + + return result; + +} + +} // namespace + +AtNode *CurvesAlgo::convert( const IECore::CurvesPrimitive *curves ) +{ + AtNode *result = convertCommon( curves ); + ShapeAlgo::convertP( curves, result, "points" ); + ShapeAlgo::convertRadius( curves, result ); + return result; } + +AtNode *CurvesAlgo::convert( const std::vector &samples, const std::vector &sampleTimes ) +{ + AtNode *result = convertCommon( samples.front() ); + + std::vector primitiveSamples( samples.begin(), samples.end() ); + ShapeAlgo::convertP( primitiveSamples, result, "points" ); + ShapeAlgo::convertRadius( primitiveSamples, result ); + + AiNodeSetArray( result, "deform_time_samples", AiArrayConvert( sampleTimes.size(), 1, AI_TYPE_FLOAT, &sampleTimes.front() ) ); + + return result; +} + diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp similarity index 69% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp index 824bddb8a2..6cf30ae1d7 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp @@ -39,7 +39,7 @@ #include "tbb/concurrent_hash_map.h" #include "IECoreArnold/InstancingConverter.h" -#include "IECoreArnold/ToArnoldConverter.h" +#include "IECoreArnold/NodeAlgo.h" using namespace IECoreArnold; @@ -61,21 +61,52 @@ InstancingConverter::~InstancingConverter() AtNode *InstancingConverter::convert( const IECore::Primitive *primitive ) { - IECore::MurmurHash h = primitive->::IECore::Object::hash(); - return convert( primitive, h ); + return convert( primitive, IECore::MurmurHash() ); } -AtNode *InstancingConverter::convert( const IECore::Primitive *primitive, const IECore::MurmurHash &hash ) +AtNode *InstancingConverter::convert( const IECore::Primitive *primitive, const IECore::MurmurHash &additionalHash ) { + IECore::MurmurHash h = primitive->::IECore::Object::hash(); + h.append( additionalHash ); + MemberData::Cache::accessor a; - if( m_data->cache.insert( a, hash ) ) + if( m_data->cache.insert( a, h ) ) + { + a->second = NodeAlgo::convert( primitive ); + return a->second; + } + else { - ToArnoldConverterPtr converter = ToArnoldConverter::create( const_cast( primitive ) ); - if( !converter ) + if( a->second ) { - return 0; + AtNode *instance = AiNode( "ginstance" ); + AiNodeSetPtr( instance, "node", a->second ); + return instance; } - a->second = converter->convert(); + } + + return NULL; +} + +AtNode *InstancingConverter::convert( const std::vector &samples, const std::vector &sampleTimes ) +{ + return convert( samples, sampleTimes, IECore::MurmurHash() ); +} + +AtNode *InstancingConverter::convert( const std::vector &samples, const std::vector &sampleTimes, const IECore::MurmurHash &additionalHash ) +{ + IECore::MurmurHash h; + for( std::vector::const_iterator it = samples.begin(), eIt = samples.end(); it != eIt; ++it ) + { + (*it)->hash( h ); + } + h.append( additionalHash ); + + MemberData::Cache::accessor a; + if( m_data->cache.insert( a, h ) ) + { + std::vector objectSamples( samples.begin(), samples.end() ); + a->second = NodeAlgo::convert( objectSamples, sampleTimes ); return a->second; } else @@ -87,8 +118,6 @@ AtNode *InstancingConverter::convert( const IECore::Primitive *primitive, const return instance; } } - - return 0; - + return NULL; } diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/MeshAlgo.cpp similarity index 52% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/MeshAlgo.cpp index 90dcfe4dda..8427760f8e 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/MeshAlgo.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2011-2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2011-2016, Image Engine Design Inc. All rights reserved. // Copyright (c) 2012, John Haddon. All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -33,45 +33,44 @@ // ////////////////////////////////////////////////////////////////////////// -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. #include "ai.h" -#include "IECore/MeshPrimitive.h" #include "IECore/Exception.h" #include "IECore/MessageHandler.h" +#include "IECore/MeshPrimitive.h" -#include "IECoreArnold/ToArnoldMeshConverter.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/ShapeAlgo.h" +#include "IECoreArnold/MeshAlgo.h" +#include "IECoreArnold/ParameterAlgo.h" -using namespace IECoreArnold; -using namespace IECore; using namespace std; +using namespace IECore; +using namespace IECoreArnold; -IE_CORE_DEFINERUNTIMETYPED( ToArnoldMeshConverter ); - -ToArnoldMeshConverter::ConverterDescription ToArnoldMeshConverter::g_description; +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// -ToArnoldMeshConverter::ToArnoldMeshConverter( IECore::MeshPrimitivePtr toConvert ) - : ToArnoldShapeConverter( "Converts IECore::MeshPrimitives to arnold polymesh nodes", IECore::MeshPrimitive::staticTypeId() ) +namespace { - srcParameter()->setValue( toConvert ); -} -ToArnoldMeshConverter::~ToArnoldMeshConverter() +AtArray *faceVaryingIndices( const IECore::MeshPrimitive *mesh ) { + vector ids; + ids.resize( mesh->variableSize( PrimitiveVariable::FaceVarying ) ); + for( size_t i=0, e=ids.size(); i < e; i++ ) + { + ids[i] = i; + } + return AiArrayConvert( ids.size(), 1, AI_TYPE_INT, (void *)&(ids[0]) ); } -AtNode *ToArnoldMeshConverter::doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const +AtNode *convertCommon( const IECore::MeshPrimitive *mesh ) { - const MeshPrimitive *mesh = static_cast( from.get() ); - const V3fVectorData *p = mesh->variableData( "P", PrimitiveVariable::Vertex ); - if( !p ) - { - throw Exception( "MeshPrimitive does not have \"P\" primitive variable of interpolation type Vertex." ); - } - - // make the result mesh and add topology and points - + + // make the result mesh and add topology + AtNode *result = AiNode( "polymesh" ); const std::vector verticesPerFace = mesh->verticesPerFace()->readable(); @@ -87,25 +86,23 @@ AtNode *ToArnoldMeshConverter::doConversion( IECore::ConstObjectPtr from, IECore "vidxs", AiArrayConvert( vertexIds.size(), 1, AI_TYPE_INT, (void *)&( vertexIds[0] ) ) ); - - convertP( p, result, "vlist" ); - + // set subdivision - + if( mesh->interpolation()=="catmullClark" ) { AiNodeSetStr( result, "subdiv_type", "catclark" ); AiNodeSetBool( result, "smoothing", true ); } - + // add uvs - + const FloatVectorData *s = mesh->variableData( "s" ); const FloatVectorData *t = mesh->variableData( "t" ); if( s && t ) { PrimitiveVariable::Interpolation sInterpolation = mesh->variables.find( "s" )->second.interpolation; - PrimitiveVariable::Interpolation tInterpolation = mesh->variables.find( "t" )->second.interpolation; + PrimitiveVariable::Interpolation tInterpolation = mesh->variables.find( "t" )->second.interpolation; if( sInterpolation == tInterpolation ) { if( sInterpolation == PrimitiveVariable::Varying || sInterpolation == PrimitiveVariable::Vertex || sInterpolation == PrimitiveVariable::FaceVarying ) @@ -118,7 +115,7 @@ AtNode *ToArnoldMeshConverter::doConversion( IECore::ConstObjectPtr from, IECore st.push_back( *sIt ); st.push_back( *tIt ); } - AiNodeSetArray( + AiNodeSetArray( result, "uvlist", AiArrayConvert( s->readable().size(), 1, AI_TYPE_POINT2, (void *)&(st[0]) ) @@ -126,7 +123,7 @@ AtNode *ToArnoldMeshConverter::doConversion( IECore::ConstObjectPtr from, IECore // build uv indices if( sInterpolation == PrimitiveVariable::FaceVarying ) { - AiNodeSetArray( + AiNodeSetArray( result, "uvidxs", faceVaryingIndices( mesh ) @@ -143,79 +140,150 @@ AtNode *ToArnoldMeshConverter::doConversion( IECore::ConstObjectPtr from, IECore } else { - msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Variables s and t have unsupported interpolation type - not generating uvs." ); - } + msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Variables s and t have unsupported interpolation type - not generating uvs." ); + } } else { - msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Variables s and t have different interpolation - not generating uvs." ); + msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Variables s and t have different interpolation - not generating uvs." ); } } else if( s || t ) { msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Only one of s and t available - not generating uvs." ); } - - /// add normals - - PrimitiveVariableMap::const_iterator nIt = mesh->variables.find( "N" ); - if( nIt != mesh->variables.end() ) - { - const V3fVectorData *n = runTimeCast( nIt->second.data.get() ); - if( n ) + + // add arbitrary user parameters + + const char *ignore[] = { "P", "s", "t", "N", 0 }; + ShapeAlgo::convertPrimitiveVariables( mesh, result, ignore ); + + return result; +} + +const V3fVectorData *normal( const IECore::MeshPrimitive *mesh, PrimitiveVariable::Interpolation &interpolation ) +{ + PrimitiveVariableMap::const_iterator it = mesh->variables.find( "N" ); + if( it == mesh->variables.end() ) + { + return NULL; + } + + const V3fVectorData *n = runTimeCast( it->second.data.get() ); + if( !n ) + { + msg( Msg::Warning, "MeshAlgo", boost::format( "Variable \"N\" has unsupported type \"%s\" (expected V3fVectorData)." ) % it->second.data->typeName() ); + return NULL; + } + + const PrimitiveVariable::Interpolation thisInterpolation = it->second.interpolation; + if( interpolation != PrimitiveVariable::Invalid && thisInterpolation != interpolation ) + { + msg( Msg::Warning, "MeshAlgo", "Variable \"N\" has inconsistent interpolation types - not generating normals." ); + return NULL; + } + + if( thisInterpolation != PrimitiveVariable::Varying && thisInterpolation != PrimitiveVariable::Vertex && thisInterpolation != PrimitiveVariable::FaceVarying ) + { + msg( Msg::Warning, "MeshAlgo", "Variable \"N\" has unsupported interpolation type - not generating normals." ); + return NULL; + } + + interpolation = thisInterpolation; + return n; +} + +void convertNormalIndices( const IECore::MeshPrimitive *mesh, AtNode *node, PrimitiveVariable::Interpolation interpolation ) +{ + if( interpolation == PrimitiveVariable::FaceVarying ) + { + AiNodeSetArray( + node, + "nidxs", + faceVaryingIndices( mesh ) + ); + } + else + { + const std::vector vertexIds = mesh->vertexIds()->readable(); + AiNodeSetArray( + node, + "nidxs", + AiArrayConvert( vertexIds.size(), 1, AI_TYPE_INT, (void *)&( vertexIds[0] ) ) + ); + } +} + +NodeAlgo::ConverterDescription g_description( MeshAlgo::convert, MeshAlgo::convert ); + +} // namespace + +////////////////////////////////////////////////////////////////////////// +// Implementation of public API +////////////////////////////////////////////////////////////////////////// + +AtNode *MeshAlgo::convert( const IECore::MeshPrimitive *mesh ) +{ + AtNode *result = convertCommon( mesh ); + + ShapeAlgo::convertP( mesh, result, "vlist" ); + + // add normals + + PrimitiveVariable::Interpolation nInterpolation = PrimitiveVariable::Invalid; + if( const V3fVectorData *n = normal( mesh, nInterpolation ) ) + { + AiNodeSetArray( + result, + "nlist", + AiArrayConvert( n->readable().size(), 1, AI_TYPE_VECTOR, &n->readable().front() ) + ); + convertNormalIndices( mesh, result, nInterpolation ); + AiNodeSetBool( result, "smoothing", true ); + } + + return result; +} + +AtNode *MeshAlgo::convert( const std::vector &samples, const std::vector &sampleTimes ) +{ + AtNode *result = convertCommon( samples.front() ); + + std::vector primitiveSamples( samples.begin(), samples.end() ); + ShapeAlgo::convertP( primitiveSamples, result, "vlist" ); + + // add normals + + vector nSamples; + nSamples.reserve( samples.size() ); + PrimitiveVariable::Interpolation nInterpolation = PrimitiveVariable::Invalid; + for( vector::const_iterator it = samples.begin(), eIt = samples.end(); it != eIt; ++it ) + { + if( const V3fVectorData *n = normal( *it, nInterpolation ) ) { - PrimitiveVariable::Interpolation nInterpolation = nIt->second.interpolation; - if( nInterpolation == PrimitiveVariable::Varying || nInterpolation == PrimitiveVariable::Vertex || nInterpolation == PrimitiveVariable::FaceVarying ) - { - AiNodeSetArray( - result, - "nlist", - AiArrayConvert( n->readable().size(), 1, AI_TYPE_VECTOR, (void *)&( n->readable()[0] ) ) - ); - if( nInterpolation == PrimitiveVariable::FaceVarying ) - { - AiNodeSetArray( - result, - "nidxs", - faceVaryingIndices( mesh ) - ); - } - else - { - AiNodeSetArray( - result, - "nidxs", - AiArrayConvert( vertexIds.size(), 1, AI_TYPE_INT, (void *)&( vertexIds[0] ) ) - ); - } - AiNodeSetBool( result, "smoothing", true ); - } - else - { - msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", "Variable \"N\" has unsupported interpolation type - not generating normals." ); - } + nSamples.push_back( n ); } else { - msg( Msg::Warning, "ToArnoldMeshConverter::doConversion", boost::format( "Variable \"N\" has unsupported type \"%s\" (expected V3fVectorData)." ) ); + break; } } - - // add arbitrary user parameters - - const char *ignore[] = { "P", "s", "t", "N", 0 }; - convertPrimitiveVariables( mesh, result, ignore ); - - return result; -} -AtArray *ToArnoldMeshConverter::faceVaryingIndices( const IECore::MeshPrimitive *mesh ) -{ - vector ids; - ids.resize( mesh->variableSize( PrimitiveVariable::FaceVarying ) ); - for( size_t i=0, e=ids.size(); i < e; i++ ) + if( nSamples.size() == samples.size() ) { - ids[i] = i; + AiNodeSetArray( + result, + "nlist", + ParameterAlgo::dataToArray( nSamples, AI_TYPE_VECTOR ) + ); + convertNormalIndices( samples.front(), result, nInterpolation ); + AiNodeSetBool( result, "smoothing", true ); } - return AiArrayConvert( ids.size(), 1, AI_TYPE_INT, (void *)&(ids[0]) ); + + // add time sampling + + AiNodeSetArray( result, "deform_time_samples", AiArrayConvert( sampleTimes.size(), 1, AI_TYPE_FLOAT, &sampleTimes.front() ) ); + + return result; } + diff --git a/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/NodeAlgo.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/NodeAlgo.cpp new file mode 100644 index 0000000000..284a319d11 --- /dev/null +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/NodeAlgo.cpp @@ -0,0 +1,133 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// * Neither the name of Image Engine Design nor the names of any +// other contributors to this software may be used to endorse or +// promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +////////////////////////////////////////////////////////////////////////// + +#include "boost/unordered_map.hpp" + +#include "IECoreArnold/NodeAlgo.h" + +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// + +namespace +{ + +using namespace IECoreArnold; + +struct Converters +{ + + Converters( NodeAlgo::Converter converter, NodeAlgo::MotionConverter motionConverter ) + : converter( converter ), motionConverter( motionConverter ) + { + } + + NodeAlgo::Converter converter; + NodeAlgo::MotionConverter motionConverter; + +}; + +typedef boost::unordered_map Registry; + +Registry ®istry() +{ + static Registry g_registry; + return g_registry; +} + +} // namespace + +////////////////////////////////////////////////////////////////////////// +// Public implementation +////////////////////////////////////////////////////////////////////////// + +namespace IECoreArnold +{ + +namespace NodeAlgo +{ + +AtNode *convert( const IECore::Object *object ) +{ + const Registry &r = registry(); + Registry::const_iterator it = r.find( object->typeId() ); + if( it == r.end() ) + { + return NULL; + } + return it->second.converter( object ); +} + +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ) +{ + if( samples.empty() ) + { + return NULL; + } + + const IECore::Object *firstSample = samples.front(); + const IECore::TypeId firstSampleTypeId = firstSample->typeId(); + for( std::vector::const_iterator it = samples.begin()+1, eIt = samples.end(); it != eIt; ++it ) + { + if( (*it)->typeId() != firstSampleTypeId ) + { + throw IECore::Exception( "Inconsistent object types." ); + } + } + + const Registry &r = registry(); + Registry::const_iterator it = r.find( firstSampleTypeId ); + if( it == r.end() ) + { + return NULL; + } + + if( it->second.motionConverter ) + { + return it->second.motionConverter( samples, sampleTimes ); + } + else + { + return it->second.converter( firstSample ); + } +} + +void registerConverter( IECore::TypeId fromType, Converter converter, MotionConverter motionConverter ) +{ + registry().insert( Registry::value_type( fromType, Converters( converter, motionConverter ) ) ); +} + +} // namespace NodeAlgo + +} // namespace IECoreArnold diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ParameterAlgo.cpp similarity index 62% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ParameterAlgo.cpp index 4557de56da..6d213f5e4a 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ParameterAlgo.cpp @@ -1,7 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2011, Image Engine Design Inc. All rights reserved. -// Copyright (c) 2012, John Haddon. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -33,38 +32,142 @@ // ////////////////////////////////////////////////////////////////////////// -// This must come before the Cortex includes, because on OSX headers included -// by TBB define macros which conflict with the inline functions in ai_types.h. -#include "ai.h" +#include "boost/interprocess/smart_ptr/unique_ptr.hpp" -#include "IECore/CompoundParameter.h" -#include "IECore/SimpleTypedData.h" #include "IECore/MessageHandler.h" +#include "IECore/SimpleTypedData.h" #include "IECore/DespatchTypedData.h" -#include "IECoreArnold/ToArnoldConverter.h" +#include "IECoreArnold/ParameterAlgo.h" +using namespace std; using namespace IECore; using namespace IECoreArnold; -IE_CORE_DEFINERUNTIMETYPED( ToArnoldConverter ); +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// + +namespace +{ + +typedef boost::interprocess::unique_ptr ArrayPtr; -ToArnoldConverter::ToArnoldConverter( const std::string &description, IECore::TypeId supportedType ) - : IECore::FromCoreConverter( description, supportedType ) +template +inline const T *dataCast( const char *name, const IECore::Data *data ) { + const T *result = runTimeCast( data ); + if( result ) + { + return result; + } + msg( Msg::Warning, "setParameter", boost::format( "Unsupported value type \"%s\" for parameter \"%s\" (expected %s)." ) % data->typeName() % name % T::staticTypeName() ); + return NULL; } -ToArnoldConverter::~ToArnoldConverter() +void setParameterInternal( AtNode *node, const char *name, int parameterType, bool array, const IECore::Data *value ) { + if( array ) + { + AtArray *a = ParameterAlgo::dataToArray( value ); + if( !a ) + { + msg( Msg::Warning, "setParameter", boost::format( "Unable to create array from data of type \"%s\" for parameter \"%s\"" ) % value->typeName() % name ); + return; + } + if( a->type != parameterType ) + { + msg( Msg::Warning, "setParameter", boost::format( "Unable to create array of type %s from data of type \"%s\" for parameter \"%s\"" ) % AiParamGetTypeName( parameterType ) % value->typeName() % name ); + return; + } + AiNodeSetArray( node, name, a ); + } + else + { + switch( parameterType ) + { + case AI_TYPE_INT : + if( const IntData *data = dataCast( name, value ) ) + { + AiNodeSetInt( node, name, data->readable() ); + } + break; + case AI_TYPE_BYTE : + if( const IntData *data = dataCast( name, value ) ) + { + AiNodeSetByte( node, name, data->readable() ); + } + break; + case AI_TYPE_FLOAT : + if( const FloatData *data = dataCast( name, value ) ) + { + AiNodeSetFlt( node, name, data->readable() ); + } + break; + case AI_TYPE_STRING : + if( const StringData *data = dataCast( name, value ) ) + { + AiNodeSetStr( node, name, data->readable().c_str() ); + } + break; + case AI_TYPE_RGB : + if( const Color3fData *data = dataCast( name, value ) ) + { + const Imath::Color3f &c = data->readable(); + AiNodeSetRGB( node, name, c[0], c[1], c[2] ); + } + break; + case AI_TYPE_ENUM : + if( const StringData *data = dataCast( name, value ) ) + { + AiNodeSetStr( node, name, data->readable().c_str() ); + } + break; + case AI_TYPE_BOOLEAN : + { + if( const BoolData *data = dataCast( name, value ) ) + { + AiNodeSetBool( node, name, data->readable() ); + } + break; + } + default : + { + msg( Msg::Warning, "setParameter", boost::format( "Arnold parameter \"%s\" has unsupported type \"%s\"." ) % name % AiParamGetTypeName( parameterType ) ); + } + } + } } -AtNode *ToArnoldConverter::convert() const +IECore::DataPtr getParameterInternal( AtNode *node, const char *name, int parameterType ) { - IECore::ConstCompoundObjectPtr operands = parameters()->getTypedValidatedValue(); - return doConversion( srcParameter()->getValidatedValue(), operands ); + switch( parameterType ) + { + case AI_TYPE_BOOLEAN : + return new BoolData( AiNodeGetBool( node, name ) ); + case AI_TYPE_INT : + return new IntData( AiNodeGetInt( node, name ) ); + case AI_TYPE_FLOAT : + return new FloatData( AiNodeGetFlt( node, name ) ); + case AI_TYPE_STRING : + return new StringData( AiNodeGetStr( node, name ) ); + } + return NULL; } -void ToArnoldConverter::setParameter( AtNode *node, const AtParamEntry *parameter, const IECore::Data *value ) +} // namespace + +////////////////////////////////////////////////////////////////////////// +// Implementation of public API. +////////////////////////////////////////////////////////////////////////// + +namespace IECoreArnold +{ + +namespace ParameterAlgo +{ + +void setParameter( AtNode *node, const AtParamEntry *parameter, const IECore::Data *value ) { bool isArray = false; int type = AiParamGetType( parameter ); @@ -73,11 +176,11 @@ void ToArnoldConverter::setParameter( AtNode *node, const AtParamEntry *paramete type = AiParamGetDefault( parameter )->ARRAY->type; isArray = true; } - + setParameterInternal( node, AiParamGetName( parameter ), type, isArray, value ); } -void ToArnoldConverter::setParameter( AtNode *node, const char *name, const IECore::Data *value ) +void setParameter( AtNode *node, const char *name, const IECore::Data *value ) { const AtParamEntry *parameter = AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( node ), name ); if( parameter ) @@ -103,14 +206,14 @@ void ToArnoldConverter::setParameter( AtNode *node, const char *name, const IECo { msg( Msg::Warning, - "ToArnoldConverter::setParameter", + "setParameter", boost::format( "Unsupported data type \"%s\" for name \"%s\"" ) % value->typeName() % name ); } } } -void ToArnoldConverter::setParameters( AtNode *node, const IECore::CompoundDataMap &values ) +void setParameters( AtNode *node, const IECore::CompoundDataMap &values ) { for( CompoundDataMap::const_iterator it=values.begin(); it!=values.end(); it++ ) { @@ -118,17 +221,17 @@ void ToArnoldConverter::setParameters( AtNode *node, const IECore::CompoundDataM } } -IECore::DataPtr ToArnoldConverter::getParameter( AtNode *node, const AtParamEntry *parameter ) +IECore::DataPtr getParameter( AtNode *node, const AtParamEntry *parameter ) { return getParameterInternal( node, AiParamGetName( parameter ), AiParamGetType( parameter ) ); } -IECore::DataPtr ToArnoldConverter::getParameter( AtNode *node, const AtUserParamEntry *parameter ) +IECore::DataPtr getParameter( AtNode *node, const AtUserParamEntry *parameter ) { return getParameterInternal( node, AiUserParamGetName( parameter ), AiUserParamGetType( parameter ) ); } - -IECore::DataPtr ToArnoldConverter::getParameter( AtNode *node, const char *name ) + +IECore::DataPtr getParameter( AtNode *node, const char *name ) { const AtParamEntry *parameter = AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( node ), name ); if( parameter ) @@ -143,15 +246,15 @@ IECore::DataPtr ToArnoldConverter::getParameter( AtNode *node, const char *name return getParameter( node, userParameter ); } } - - return 0; + + return NULL; } -void ToArnoldConverter::getParameters( AtNode *node, IECore::CompoundDataMap &values ) +void getParameters( AtNode *node, IECore::CompoundDataMap &values ) { /// \todo Non-user parameters - AtUserParamIterator *it = AiNodeGetUserParamIterator( node ); + AtUserParamIterator *it = AiNodeGetUserParamIterator( node ); while( const AtUserParamEntry *param = AiUserParamIteratorGetNext( it ) ) { DataPtr d = getParameter( node, param ); @@ -163,7 +266,7 @@ void ToArnoldConverter::getParameters( AtNode *node, IECore::CompoundDataMap &va { msg( Msg::Warning, - "ToArnoldConverter::getParameters", + "getParameters", boost::format( "Unable to convert user parameter \"%s\"" ) % AiUserParamGetName( param ) ); } @@ -171,7 +274,7 @@ void ToArnoldConverter::getParameters( AtNode *node, IECore::CompoundDataMap &va AiUserParamIteratorDestroy( it ); } -int ToArnoldConverter::parameterType( IECore::TypeId dataType, bool &array ) +int parameterType( IECore::TypeId dataType, bool &array ) { switch( dataType ) { @@ -215,136 +318,59 @@ int ToArnoldConverter::parameterType( IECore::TypeId dataType, bool &array ) } } -AtArray *ToArnoldConverter::dataToArray( const IECore::Data *data ) +AtArray *dataToArray( const IECore::Data *data, int aiType ) { - bool isArray = false; - int type = parameterType( data->typeId(), isArray ); - if( type == AI_TYPE_NONE || !isArray ) + if( aiType == AI_TYPE_NONE ) { - return 0; + bool isArray = false; + aiType = parameterType( data->typeId(), isArray ); + if( aiType == AI_TYPE_NONE || !isArray ) + { + return NULL; + } } - + const void *dataAddress = despatchTypedData( const_cast( data ) ); size_t dataSize = despatchTypedData( const_cast( data ) ); - return AiArrayConvert( dataSize, 1, type, dataAddress ); + return AiArrayConvert( dataSize, 1, aiType, dataAddress ); } -template -static inline const T *dataCast( const char *name, const IECore::Data *data ) +IECOREARNOLD_API AtArray *dataToArray( const std::vector &samples, int aiType ) { - const T *result = runTimeCast( data ); - if( result ) + if( aiType == AI_TYPE_NONE ) { - return result; + bool isArray = false; + aiType = parameterType( samples.front()->typeId(), isArray ); + if( aiType == AI_TYPE_NONE || !isArray ) + { + return NULL; + } } - msg( Msg::Warning, "ToArnoldConverter::setParameter", boost::format( "Unsupported value type \"%s\" for parameter \"%s\" (expected %s)." ) % data->typeName() % name % T::staticTypeName() ); - return 0; -} -void ToArnoldConverter::setParameterInternal( AtNode *node, const char *name, int parameterType, bool array, const IECore::Data *value ) -{ - if( array ) + size_t arraySize = despatchTypedData( const_cast( samples.front() ) ); + ArrayPtr array( + AiArrayAllocate( arraySize, samples.size(), aiType ), + AiArrayDestroy + ); + + for( vector::const_iterator it = samples.begin(), eIt = samples.end(); it != eIt; ++it ) { - AtArray *a = dataToArray( value ); - if( !a ) + if( (*it)->typeId() != samples.front()->typeId() ) { - msg( Msg::Warning, "ToArnoldConverter::setParameter", boost::format( "Unable to create array from data of type \"%s\" for parameter \"%s\"" ) % value->typeName() % name ); - return; + throw IECore::Exception( "ParameterAlgo::dataToArray() : Mismatched sample types." ); } - if( a->type != parameterType ) + const size_t dataSize = despatchTypedData( const_cast( *it ) ); + if( dataSize != arraySize ) { - msg( Msg::Warning, "ToArnoldConverter::setParameter", boost::format( "Unable to create array of type %s from data of type \"%s\" for parameter \"%s\"" ) % AiParamGetTypeName( parameterType ) % value->typeName() % name ); - return; + throw IECore::Exception( "ParameterAlgo::dataToArray() : Mismatched sample lengths." ); } - AiNodeSetArray( node, name, a ); + const void *dataAddress = despatchTypedData( const_cast( *it ) ); + AiArraySetKey( array.get(), /* key = */ it - samples.begin(), dataAddress ); } - else - { - switch( parameterType ) - { - case AI_TYPE_INT : - if( const IntData *data = dataCast( name, value ) ) - { - AiNodeSetInt( node, name, data->readable() ); - } - break; - case AI_TYPE_BYTE : - if( const IntData *data = dataCast( name, value ) ) - { - AiNodeSetByte( node, name, data->readable() ); - } - break; - case AI_TYPE_FLOAT : - if( const FloatData *data = dataCast( name, value ) ) - { - AiNodeSetFlt( node, name, data->readable() ); - } - break; - case AI_TYPE_STRING : - if( const StringData *data = dataCast( name, value ) ) - { - AiNodeSetStr( node, name, data->readable().c_str() ); - } - break; - case AI_TYPE_RGB : - if( const Color3fData *data = dataCast( name, value ) ) - { - const Imath::Color3f &c = data->readable(); - AiNodeSetRGB( node, name, c[0], c[1], c[2] ); - } - break; - case AI_TYPE_ENUM : - if( const StringData *data = dataCast( name, value ) ) - { - AiNodeSetStr( node, name, data->readable().c_str() ); - } - break; - case AI_TYPE_BOOLEAN : - { - if( const BoolData *data = dataCast( name, value ) ) - { - AiNodeSetBool( node, name, data->readable() ); - } - break; - } - default : - { - msg( Msg::Warning, "ToArnoldConverter::setParameter", boost::format( "Arnold parameter \"%s\" has unsupported type \"%s\"." ) % name % AiParamGetTypeName( parameterType ) ); - } - } - } -} -IECore::DataPtr ToArnoldConverter::getParameterInternal( AtNode *node, const char *name, int parameterType ) -{ - switch( parameterType ) - { - case AI_TYPE_BOOLEAN : - return new BoolData( AiNodeGetBool( node, name ) ); - case AI_TYPE_INT : - return new IntData( AiNodeGetInt( node, name ) ); - case AI_TYPE_FLOAT : - return new FloatData( AiNodeGetFlt( node, name ) ); - case AI_TYPE_STRING : - return new StringData( AiNodeGetStr( node, name ) ); - } - return 0; + return array.release(); } -ToArnoldConverterPtr ToArnoldConverter::create( IECore::ObjectPtr object ) -{ - const CreatorMap &m = creators(); - CreatorMap::const_iterator it = m.find( object->typeId() ); - if( it != m.end() ) - { - return it->second( object ); - } - return 0; -} - -ToArnoldConverter::CreatorMap &ToArnoldConverter::creators() -{ - static CreatorMap m; - return m; -} +} // namespace ParameterAlgo +} // namespace IECoreArnold diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/PointsAlgo.cpp similarity index 61% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/PointsAlgo.cpp index a10a4d7181..263a5daab6 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/PointsAlgo.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2012-2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -38,43 +38,30 @@ #include "IECore/SimpleTypedData.h" #include "IECore/MessageHandler.h" -#include "IECoreArnold/ToArnoldPointsConverter.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/ShapeAlgo.h" +#include "IECoreArnold/PointsAlgo.h" -using namespace IECoreArnold; -using namespace IECore; using namespace std; +using namespace IECore; +using namespace IECoreArnold; -IE_CORE_DEFINERUNTIMETYPED( ToArnoldPointsConverter ); - -ToArnoldPointsConverter::ConverterDescription ToArnoldPointsConverter::g_description; +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// -ToArnoldPointsConverter::ToArnoldPointsConverter( IECore::PointsPrimitivePtr toConvert ) - : ToArnoldShapeConverter( "Converts IECore::PointsPrimitives to arnold points nodes", IECore::PointsPrimitive::staticTypeId() ) +namespace { - srcParameter()->setValue( toConvert ); -} -ToArnoldPointsConverter::~ToArnoldPointsConverter() -{ -} +NodeAlgo::ConverterDescription g_description( PointsAlgo::convert, PointsAlgo::convert ); -AtNode *ToArnoldPointsConverter::doConversion( IECore::ConstObjectPtr from, IECore::ConstCompoundObjectPtr operands ) const +AtNode *convertCommon( const IECore::PointsPrimitive *points ) { - const PointsPrimitive *points = static_cast( from.get() ); - const V3fVectorData *p = points->variableData( "P", PrimitiveVariable::Vertex ); - if( !p ) - { - throw Exception( "PointsPrimitive does not have \"P\" primitive variable of interpolation type Vertex." ); - } - - // make the result points and set the positions - + AtNode *result = AiNode( "points" ); - - convertP( p, result, "points" ); - + // mode - + const StringData *t = points->variableData( "type", PrimitiveVariable::Constant ); if( t ) { @@ -96,14 +83,55 @@ AtNode *ToArnoldPointsConverter::doConversion( IECore::ConstObjectPtr from, IECo } } - convertRadius( points, result ); + // arbitrary user parameters - /// \todo Aspect, rotation - - // add arbitrary user parameters - const char *ignore[] = { "P", "width", "radius", 0 }; - convertPrimitiveVariables( points, result, ignore ); + ShapeAlgo::convertPrimitiveVariables( points, result, ignore ); return result; + } + +} // namespace + +////////////////////////////////////////////////////////////////////////// +// Implementation of public API +////////////////////////////////////////////////////////////////////////// + +namespace IECoreArnold +{ + +namespace PointsAlgo +{ + +AtNode *convert( const IECore::PointsPrimitive *points ) +{ + AtNode *result = convertCommon( points ); + + ShapeAlgo::convertP( points, result, "points" ); + ShapeAlgo::convertRadius( points, result ); + + /// \todo Aspect, rotation + + return result; +} + +AtNode *convert( const std::vector &samples, const std::vector &sampleTimes ) +{ + AtNode *result = convertCommon( samples.front() ); + + std::vector primitiveSamples( samples.begin(), samples.end() ); + ShapeAlgo::convertP( primitiveSamples, result, "points" ); + ShapeAlgo::convertRadius( primitiveSamples, result ); + + AiNodeSetArray( result, "deform_time_samples", AiArrayConvert( sampleTimes.size(), 1, AI_TYPE_FLOAT, &sampleTimes.front() ) ); + + /// \todo Aspect, rotation + + return result; +} + +} // namespace PointsAlgo + +} // namespace IECoreArnold + diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp index 918787752a..ee8198c596 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp @@ -266,12 +266,12 @@ void Renderer::editEnd() { m_implementation->editEnd(); } - + size_t Renderer::numProceduralNodes() const { return m_implementation->m_nodes.size(); } - + void *Renderer::proceduralNode( size_t index ) { return m_implementation->m_nodes[index]; diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp similarity index 84% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp index 59f12fdfa7..45ab2c0def 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp @@ -51,7 +51,9 @@ #include "IECore/PointsPrimitive.h" #include "IECoreArnold/private/RendererImplementation.h" -#include "IECoreArnold/ToArnoldCameraConverter.h" +#include "IECoreArnold/ParameterAlgo.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/CameraAlgo.h" using namespace IECore; using namespace IECoreArnold; @@ -59,6 +61,14 @@ using namespace Imath; using namespace std; using namespace boost; +namespace +{ + +InternedString g_aiAutomaticInstancingAttributeName( "ai:automaticInstancing" ); +InternedString g_automaticInstancingAttributeName( "automaticInstancing" ); + +} // namespace + //////////////////////////////////////////////////////////////////////// // AttributeState implementation //////////////////////////////////////////////////////////////////////// @@ -83,7 +93,7 @@ RendererImplementation::AttributeState::AttributeState( const AttributeState &ot shaders = other.shaders; attributes = other.attributes->copy(); } - + //////////////////////////////////////////////////////////////////////// // RendererImplementation implementation //////////////////////////////////////////////////////////////////////// @@ -104,10 +114,10 @@ IECoreArnold::RendererImplementation::RendererImplementation( const std::string } IECoreArnold::RendererImplementation::RendererImplementation( const RendererImplementation &other ) + : m_transformStack( other.m_transformStack, /* flatten = */ true ) { constructCommon( Procedural ); m_instancingConverter = other.m_instancingConverter; - m_transformStack.push( other.m_transformStack.top() ); m_attributeStack.push( AttributeState( other.m_attributeStack.top() ) ); } @@ -116,7 +126,6 @@ IECoreArnold::RendererImplementation::RendererImplementation( const AtNode *proc constructCommon( Procedural ); m_instancingConverter = new InstancingConverter; /// \todo Initialise stacks properly!! - m_transformStack.push( M44f() ); m_attributeStack.push( AttributeState() ); // the AttributeState constructor makes a surface shader node, and // it's essential that we return that as one of the nodes created by @@ -131,7 +140,7 @@ void IECoreArnold::RendererImplementation::constructCommon( Mode mode ) { m_universe = boost::shared_ptr( new UniverseBlock() ); m_instancingConverter = new InstancingConverter; - + /// \todo Control with an option AiMsgSetConsoleFlags( AI_LOG_ALL ); @@ -139,7 +148,6 @@ void IECoreArnold::RendererImplementation::constructCommon( Mode mode ) m_defaultFilter = AiNode( "gaussian_filter" ); AiNodeSetStr( m_defaultFilter, "name", "ieCoreArnold:defaultFilter" ); - m_transformStack.push( M44f() ); m_attributeStack.push( AttributeState() ); } } @@ -164,14 +172,14 @@ void IECoreArnold::RendererImplementation::setOption( const std::string &name, I const AtParamEntry *parameter = AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( options ), name.c_str() + 3 ); if( parameter ) { - ToArnoldConverter::setParameter( options, name.c_str() + 3, value.get() ); + ParameterAlgo::setParameter( options, name.c_str() + 3, value.get() ); return; } } else if( 0 == name.compare( 0, 5, "user:" ) ) { AtNode *options = AiUniverseGetOptions(); - ToArnoldConverter::setParameter( options, name.c_str(), value.get() ); + ParameterAlgo::setParameter( options, name.c_str(), value.get() ); return; } else if( name.find_first_of( ":" )!=string::npos ) @@ -179,8 +187,8 @@ void IECoreArnold::RendererImplementation::setOption( const std::string &name, I // ignore options prefixed for some other renderer return; } - - msg( Msg::Warning, "IECoreArnold::RendererImplementation::setOption", format( "Unknown option \"%s\"." ) % name ); + + msg( Msg::Warning, "IECoreArnold::RendererImplementation::setOption", format( "Unknown option \"%s\"." ) % name ); } IECore::ConstDataPtr IECoreArnold::RendererImplementation::getOption( const std::string &name ) const @@ -188,12 +196,12 @@ IECore::ConstDataPtr IECoreArnold::RendererImplementation::getOption( const std: if( 0 == name.compare( 0, 3, "ai:" ) ) { AtNode *options = AiUniverseGetOptions(); - return ToArnoldConverter::getParameter( options, name.c_str() + 3 ); + return ParameterAlgo::getParameter( options, name.c_str() + 3 ); } else if( 0 == name.compare( 0, 5, "user:" ) ) { AtNode *options = AiUniverseGetOptions(); - return ToArnoldConverter::getParameter( options, name.c_str() ); + return ParameterAlgo::getParameter( options, name.c_str() ); } else if( name == "shutter" ) { @@ -211,13 +219,12 @@ void IECoreArnold::RendererImplementation::camera( const std::string &name, cons CameraPtr cortexCamera = new Camera( name, 0, new CompoundData( parameters ) ); cortexCamera->addStandardParameters(); - ToArnoldCameraConverterPtr converter = new ToArnoldCameraConverter( cortexCamera ); - AtNode *arnoldCamera = converter->convert(); + AtNode *arnoldCamera = CameraAlgo::convert( cortexCamera.get() ); AtNode *options = AiUniverseGetOptions(); AiNodeSetPtr( options, "camera", arnoldCamera ); - + applyTransformToNode( arnoldCamera ); - + const V2iData *resolution = cortexCamera->parametersData()->member( "resolution" ); AiNodeSetInt( options, "xres", resolution->readable().x ); AiNodeSetInt( options, "yres", resolution->readable().y ); @@ -243,24 +250,24 @@ void IECoreArnold::RendererImplementation::display( const std::string &name, con driver = AiNode( prefixedType.c_str() ); } } - + if( !driver ) { msg( Msg::Error, "IECoreArnold::RendererImplementation::display", boost::format( "Unable to create display of type \"%s\"" ) % type ); return; } - + string nodeName = boost::str( boost::format( "ieCoreArnold:display%d" ) % m_outputDescriptions.size() ); AiNodeSetStr( driver, "name", nodeName.c_str() ); - + const AtParamEntry *fileNameParameter = AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( driver ), "filename" ); if( fileNameParameter ) { AiNodeSetStr( driver, AiParamGetName( fileNameParameter ), name.c_str() ); } - ToArnoldConverter::setParameters( driver, parameters ); - + ParameterAlgo::setParameters( driver, parameters ); + string d = data; if( d=="rgb" ) { @@ -270,7 +277,7 @@ void IECoreArnold::RendererImplementation::display( const std::string &name, con { d = "RGBA RGBA"; } - + std::string outputDescription = str( format( "%s %s %s" ) % d.c_str() % AiNodeGetName( m_defaultFilter ) % nodeName.c_str() ); m_outputDescriptions.push_back( outputDescription ); } @@ -285,13 +292,9 @@ void IECoreArnold::RendererImplementation::worldBegin() if( m_transformStack.size() > 1 ) { msg( Msg::Warning, "IECoreArnold::RendererImplementation::worldBegin", "Missing transformEnd() call detected." ); - while( m_transformStack.size() > 1 ) - { - m_transformStack.pop(); - } - m_transformStack.top() = M44f(); } - + m_transformStack = TransformStack(); + // specify default camera if none has been specified yet AtNode *options = AiUniverseGetOptions(); @@ -307,7 +310,7 @@ void IECoreArnold::RendererImplementation::worldBegin() { AiArraySetStr( outputsArray, i, m_outputDescriptions[i].c_str() ); } - AiNodeSetArray( options, "outputs", outputsArray ); + AiNodeSetArray( options, "outputs", outputsArray ); } @@ -329,23 +332,29 @@ void IECoreArnold::RendererImplementation::worldEnd() void IECoreArnold::RendererImplementation::transformBegin() { - m_transformStack.push( ( m_transformStack.top() ) ); + m_transformStack.push(); } void IECoreArnold::RendererImplementation::transformEnd() { - if( m_transformStack.size() <= 1 ) + try { - msg( Msg::Warning, "IECoreArnold::RendererImplementation::transformEnd", "No matching transformBegin() call." ); + m_transformStack.pop(); + } + catch( const std::exception &e ) + { + msg( Msg::Warning, "IECoreArnold::RendererImplementation::transformEnd", e.what() ); return; } - - m_transformStack.pop(); } void IECoreArnold::RendererImplementation::setTransform( const Imath::M44f &m ) { - m_transformStack.top() = m; + if( m_motionTimes.size() && !m_transformStack.inMotion() ) + { + m_transformStack.motionBegin( m_motionTimes ); + } + m_transformStack.set( m ); } void IECoreArnold::RendererImplementation::setTransform( const std::string &coordinateSystem ) @@ -355,19 +364,22 @@ void IECoreArnold::RendererImplementation::setTransform( const std::string &coor Imath::M44f IECoreArnold::RendererImplementation::getTransform() const { - return m_transformStack.top(); + return m_transformStack.get(); } Imath::M44f IECoreArnold::RendererImplementation::getTransform( const std::string &coordinateSystem ) const { msg( Msg::Warning, "IECoreArnold::RendererImplementation::getTransform", "Not implemented" ); - M44f result; - return result; + return M44f(); } void IECoreArnold::RendererImplementation::concatTransform( const Imath::M44f &m ) { - m_transformStack.top() = m * m_transformStack.top(); + if( m_motionTimes.size() && !m_transformStack.inMotion() ) + { + m_transformStack.motionBegin( m_motionTimes ); + } + m_transformStack.concatenate( m ); } void IECoreArnold::RendererImplementation::coordinateSystem( const std::string &name ) @@ -406,7 +418,7 @@ void IECoreArnold::RendererImplementation::shader( const std::string &type, cons if( type=="shader" || type=="ai:shader" || type=="surface" || type=="ai:surface" || - type=="displacement" || type=="ai:displacement" + type=="displacement" || type=="ai:displacement" ) { AtNode *s = 0; @@ -418,7 +430,7 @@ void IECoreArnold::RendererImplementation::shader( const std::string &type, cons msg( Msg::Warning, "IECoreArnold::RendererImplementation::shader", boost::format( "Couldn't find shader \"%s\"" ) % name ); return; } - } + } else { s = AiNode( name.c_str() ); @@ -442,16 +454,16 @@ void IECoreArnold::RendererImplementation::shader( const std::string &type, cons } else { - msg( Msg::Warning, "IECoreArnold::RendererImplementation::shader", boost::format( "Couldn't find shader handle \"%s\" for linking" ) % linkHandle ); + msg( Msg::Warning, "IECoreArnold::RendererImplementation::shader", boost::format( "Couldn't find shader handle \"%s\" for linking" ) % linkHandle ); } continue; } } - ToArnoldConverter::setParameter( s, parmIt->first.value().c_str(), parmIt->second.get() ); + ParameterAlgo::setParameter( s, parmIt->first.value().c_str(), parmIt->second.get() ); } addNode( s ); } - + if( type=="shader" || type == "ai:shader" ) { CompoundDataMap::const_iterator handleIt = parameters.find( "__handle" ); @@ -462,7 +474,7 @@ void IECoreArnold::RendererImplementation::shader( const std::string &type, cons } else { - msg( Msg::Warning, "IECoreArnold::RendererImplementation::shader", "No __handle parameter specified." ); + msg( Msg::Warning, "IECoreArnold::RendererImplementation::shader", "No __handle parameter specified." ); } } else if( type=="surface" || type == "ai:surface" ) @@ -506,7 +518,7 @@ void IECoreArnold::RendererImplementation::light( const std::string &name, const } for( CompoundDataMap::const_iterator parmIt=parameters.begin(); parmIt!=parameters.end(); parmIt++ ) { - ToArnoldConverter::setParameter( l, parmIt->first.value().c_str(), parmIt->second.get() ); + ParameterAlgo::setParameter( l, parmIt->first.value().c_str(), parmIt->second.get() ); } applyTransformToNode( l ); addNode( l ); @@ -523,12 +535,29 @@ void IECoreArnold::RendererImplementation::illuminate( const std::string &lightH void IECoreArnold::RendererImplementation::motionBegin( const std::set × ) { - msg( Msg::Warning, "IECoreArnold::RendererImplementation::motionBegin", "Not implemented" ); + if( !m_motionTimes.empty() ) + { + msg( Msg::Error, "IECoreArnold::RendererImplementation::motionBegin", "Already in a motion block." ); + return; + } + + m_motionTimes.insert( m_motionTimes.end(), times.begin(), times.end() ); } void IECoreArnold::RendererImplementation::motionEnd() { - msg( Msg::Warning, "IECoreArnold::RendererImplementation::motionEnd", "Not implemented" ); + if( m_motionTimes.empty() ) + { + msg( Msg::Error, "IECoreArnold::RendererImplementation::motionEnd", "Not in a motion block." ); + return; + } + + m_motionTimes.clear(); + m_motionPrimitives.clear(); + if( m_transformStack.inMotion() ) + { + m_transformStack.motionEnd(); + } } ///////////////////////////////////////////////////////////////////////////////////////// @@ -538,7 +567,7 @@ void IECoreArnold::RendererImplementation::motionEnd() void IECoreArnold::RendererImplementation::points( size_t numPoints, const IECore::PrimitiveVariableMap &primVars ) { PointsPrimitivePtr points = new IECore::PointsPrimitive( numPoints ); - points->variables = primVars; + points->variables = primVars; addPrimitive( points.get(), "ai:points:" ); } @@ -573,10 +602,10 @@ void IECoreArnold::RendererImplementation::sphere( float radius, float zMin, flo { msg( Msg::Warning, "IECoreArnold::RendererImplementation::sphere", "thetaMax not supported" ); } - + AtNode *sphere = AiNode( "sphere" ); AiNodeSetFlt( sphere, "radius", radius ); - + addShape( sphere ); } @@ -656,13 +685,13 @@ void IECoreArnold::RendererImplementation::procedural( IECore::Renderer::Procedu { return; } - + AtNode *procedural = AiNode( "procedural" ); if( ExternalProcedural *externalProc = dynamic_cast( proc.get() ) ) { AiNodeSetStr( procedural, "dso", externalProc->fileName().c_str() ); - ToArnoldConverter::setParameters( procedural, externalProc->parameters() ); + ParameterAlgo::setParameters( procedural, externalProc->parameters() ); applyTransformToNode( procedural ); } else @@ -673,15 +702,20 @@ void IECoreArnold::RendererImplementation::procedural( IECore::Renderer::Procedu // generates. if( bound != Procedural::noBound ) { - bound = transform( bound, m_transformStack.top() ); + Box3f transformedBound; + for( size_t i = 0, e = m_transformStack.numSamples(); i < e; ++i ) + { + transformedBound.extendBy( transform( bound, m_transformStack.sample( i ) ) ); + } + bound = transformedBound; } AiNodeSetPtr( procedural, "funcptr", (void *)procLoader ); - + ProceduralData *data = new ProceduralData; data->procedural = proc; data->renderer = new IECoreArnold::Renderer( new RendererImplementation( *this ) ); - + AiNodeSetPtr( procedural, "userptr", data ); } @@ -702,29 +736,44 @@ void IECoreArnold::RendererImplementation::procedural( IECore::Renderer::Procedu addNode( procedural ); } -void IECoreArnold::RendererImplementation::addPrimitive( const IECore::Primitive *primitive, const std::string &attributePrefix ) +bool IECoreArnold::RendererImplementation::automaticInstancing() const { const CompoundDataMap &attributes = m_attributeStack.top().attributes->readable(); - - bool automaticInstancing = true; - CompoundDataMap::const_iterator it = attributes.find( "ai:automaticInstancing" ); + CompoundDataMap::const_iterator it = attributes.find( g_aiAutomaticInstancingAttributeName ); if( it != attributes.end() && it->second->typeId() == IECore::BoolDataTypeId ) { - automaticInstancing = static_cast( it->second.get() )->readable(); + return static_cast( it->second.get() )->readable(); } else { - it = attributes.find( "automaticInstancing" ); + it = attributes.find( g_automaticInstancingAttributeName ); if( it != attributes.end() && it->second->typeId() == IECore::BoolDataTypeId ) { - automaticInstancing = static_cast( it->second.get() )->readable(); - } + return static_cast( it->second.get() )->readable(); + } + } + return true; +} + +void IECoreArnold::RendererImplementation::addPrimitive( const IECore::Primitive *primitive, const std::string &attributePrefix ) +{ + if( !m_motionTimes.empty() ) + { + // We're in a motion block. Just store samples + // until we have all of them. + m_motionPrimitives.push_back( primitive ); + if( m_motionPrimitives.size() != m_motionTimes.size() ) + { + return; + } } - - AtNode *shape = 0; - if( automaticInstancing ) + + const CompoundDataMap &attributes = m_attributeStack.top().attributes->readable(); + + AtNode *shape = NULL; + if( automaticInstancing() ) { - IECore::MurmurHash hash = primitive->::IECore::Object::hash(); + IECore::MurmurHash hash; for( CompoundDataMap::const_iterator it = attributes.begin(), eIt = attributes.end(); it != eIt; it++ ) { if( it->first.value().compare( 0, attributePrefix.size(), attributePrefix )==0 ) @@ -733,14 +782,37 @@ void IECoreArnold::RendererImplementation::addPrimitive( const IECore::Primitive it->second->hash( hash ); } } - shape = m_instancingConverter->convert( primitive, hash ); + if( !m_motionTimes.empty() ) + { + vector prims; + for( vector::const_iterator it = m_motionPrimitives.begin(), eIt = m_motionPrimitives.end(); it != eIt; ++it ) + { + prims.push_back( it->get() ); + } + shape = m_instancingConverter->convert( prims, m_motionTimes, hash ); + } + else + { + shape = m_instancingConverter->convert( primitive, hash ); + } } else { - ToArnoldConverterPtr converter = ToArnoldConverter::create( const_cast( primitive ) ); - shape = converter->convert(); + if( !m_motionTimes.empty() ) + { + vector prims; + for( vector::const_iterator it = m_motionPrimitives.begin(), eIt = m_motionPrimitives.end(); it != eIt; ++it ) + { + prims.push_back( it->get() ); + } + shape = NodeAlgo::convert( prims, m_motionTimes ); + } + else + { + shape = NodeAlgo::convert( primitive ); + } } - + if( strcmp( AiNodeEntryGetName( AiNodeGetNodeEntry( shape ) ), "ginstance" ) ) { // it's not an instance, copy over attributes destined for this object type. @@ -749,7 +821,7 @@ void IECoreArnold::RendererImplementation::addPrimitive( const IECore::Primitive { if( it->first.value().compare( 0, attributePrefix.size(), attributePrefix )==0 ) { - ToArnoldConverter::setParameter( shape, it->first.value().c_str() + attributePrefix.size(), it->second.get() ); + ParameterAlgo::setParameter( shape, it->first.value().c_str() + attributePrefix.size(), it->second.get() ); } } } @@ -758,17 +830,17 @@ void IECoreArnold::RendererImplementation::addPrimitive( const IECore::Primitive // it's an instance - make sure we don't get double transformations. AiNodeSetBool( shape, "inherit_xform", false ); } - + addShape( shape ); } void IECoreArnold::RendererImplementation::addShape( AtNode *shape ) { applyTransformToNode( shape ); - applyVisibilityToNode( shape ); - + applyVisibilityToNode( shape ); + AiNodeSetPtr( shape, "shader", m_attributeStack.top().surfaceShader ); - + if( AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( shape ), "disp_map" ) ) { if( m_attributeStack.top().displacementShader ) @@ -776,35 +848,47 @@ void IECoreArnold::RendererImplementation::addShape( AtNode *shape ) AiNodeSetPtr( shape, "disp_map", m_attributeStack.top().displacementShader ); } } - + addNode( shape ); } void IECoreArnold::RendererImplementation::applyTransformToNode( AtNode *node ) { - /// \todo Make Convert.h - const Imath::M44f &m = m_transformStack.top(); - AtMatrix mm; - for( unsigned int i=0; i<4; i++ ) + const size_t numSamples = m_transformStack.numSamples(); + if( numSamples == 1 ) + { + AiNodeSetMatrix( node, "matrix", m_transformStack.get().x ); + } + else { - for( unsigned int j=0; j<4; j++ ) + AtArray *times = AiArrayAllocate( numSamples, 1, AI_TYPE_FLOAT ); + AtArray *matrices = AiArrayAllocate( 1, numSamples, AI_TYPE_MATRIX ); + for( size_t i = 0; i < numSamples; ++i ) { - mm[i][j] = m[i][j]; + AiArraySetFlt( times, i, m_transformStack.sampleTime( i ) ); + AiArraySetMtx( matrices, i, m_transformStack.sample( i ).x ); + } + AiNodeSetArray( node, "matrix", matrices ); + if( AiNodeEntryLookUpParameter( AiNodeGetNodeEntry( node ), "transform_time_samples" ) ) + { + AiNodeSetArray( node, "transform_time_samples", times ); + } + else + { + AiNodeSetArray( node, "time_samples", times ); } } - - AiNodeSetMatrix( node, "matrix", mm ); } void IECoreArnold::RendererImplementation::applyVisibilityToNode( AtNode *node ) -{ - int visibility = 0; +{ + AtByte visibility = 0; const BoolData *visData = m_attributeStack.top().attributes->member( "ai:visibility:camera" ); if( visData->readable() ) { visibility |= AI_RAY_CAMERA; } - + visData = m_attributeStack.top().attributes->member( "ai:visibility:shadow" ); if( visData->readable() ) { @@ -816,26 +900,26 @@ void IECoreArnold::RendererImplementation::applyVisibilityToNode( AtNode *node ) { visibility |= AI_RAY_REFLECTED; } - + visData = m_attributeStack.top().attributes->member( "ai:visibility:refracted" ); if( visData->readable() ) { visibility |= AI_RAY_REFRACTED; } - + visData = m_attributeStack.top().attributes->member( "ai:visibility:diffuse" ); if( visData->readable() ) { visibility |= AI_RAY_DIFFUSE; } - + visData = m_attributeStack.top().attributes->member( "ai:visibility:glossy" ); if( visData->readable() ) { visibility |= AI_RAY_GLOSSY; } - - AiNodeSetInt( node, "visibility", visibility ); + + AiNodeSetByte( node, "visibility", visibility ); } void IECoreArnold::RendererImplementation::addNode( AtNode *node ) @@ -884,4 +968,4 @@ void IECoreArnold::RendererImplementation::editBegin( const std::string &editTyp void IECoreArnold::RendererImplementation::editEnd() { msg( Msg::Warning, "IECoreArnold::RendererImplementation::editEnd", "Not implemented" ); -} +} diff --git a/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ShapeAlgo.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ShapeAlgo.cpp new file mode 100644 index 0000000000..b357177779 --- /dev/null +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/ShapeAlgo.cpp @@ -0,0 +1,259 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2012-2016, Image Engine Design Inc. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// * Neither the name of Image Engine Design nor the names of any +// other contributors to this software may be used to endorse or +// promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +////////////////////////////////////////////////////////////////////////// + +#include "ai.h" + +#include "IECore/VectorTypedData.h" +#include "IECore/SimpleTypedData.h" +#include "IECore/Primitive.h" +#include "IECore/MessageHandler.h" + +#include "IECoreArnold/ParameterAlgo.h" +#include "IECoreArnold/ShapeAlgo.h" + +using namespace std; +using namespace IECore; +using namespace IECoreArnold; + +////////////////////////////////////////////////////////////////////////// +// Internal utilities +////////////////////////////////////////////////////////////////////////// + +namespace +{ + +ConstFloatVectorDataPtr radius( const Primitive *primitive ) +{ + if( ConstFloatVectorDataPtr radius = primitive->variableData( "radius" ) ) + { + return radius; + } + + FloatVectorDataPtr calculatedRadius = new FloatVectorData(); + if( const FloatData *constantRadius = primitive->variableData( "radius", PrimitiveVariable::Constant ) ) + { + calculatedRadius->writable().push_back( constantRadius->readable() ); + } + else if( const FloatVectorData *width = primitive->variableData( "width" ) ) + { + calculatedRadius->writable().resize( width->readable().size() ); + const std::vector::iterator end = calculatedRadius->writable().end(); + std::vector::const_iterator wIt = width->readable().begin(); + for( std::vector::iterator it = calculatedRadius->writable().begin(); it != end; it++, wIt++ ) + { + *it = *wIt / 2.0f; + } + } + else + { + const FloatData *constantWidth = primitive->variableData( "width", PrimitiveVariable::Constant ); + if( !constantWidth ) + { + constantWidth = primitive->variableData( "constantwidth", PrimitiveVariable::Constant ); + } + float r = constantWidth ? constantWidth->readable() / 2.0f : 0.5f; + calculatedRadius->writable().push_back( r ); + } + return calculatedRadius; +} + +} // namespace + +////////////////////////////////////////////////////////////////////////// +// Implementation of public API. +////////////////////////////////////////////////////////////////////////// + +namespace IECoreArnold +{ + +namespace ShapeAlgo +{ + +void convertP( const IECore::Primitive *primitive, AtNode *shape, const char *name ) +{ + const V3fVectorData *p = primitive->variableData( "P", PrimitiveVariable::Vertex ); + if( !p ) + { + throw Exception( "Primitive does not have \"P\" primitive variable of interpolation type Vertex." ); + } + + AiNodeSetArray( + shape, + name, + AiArrayConvert( p->readable().size(), 1, AI_TYPE_POINT, (void *)&( p->readable()[0] ) ) + ); +} + +void convertP( const std::vector &samples, AtNode *shape, const char *name ) +{ + vector dataSamples; + dataSamples.reserve( samples.size() ); + + for( vector::const_iterator it = samples.begin(), eIt = samples.end(); it != eIt; ++it ) + { + const V3fVectorData *p = (*it)->variableData( "P", PrimitiveVariable::Vertex ); + if( !p ) + { + throw Exception( "Primitive does not have \"P\" primitive variable of interpolation type Vertex." ); + } + dataSamples.push_back( p ); + } + + AtArray *array = ParameterAlgo::dataToArray( dataSamples, AI_TYPE_POINT ); + AiNodeSetArray( shape, name, array ); +} + +void convertRadius( const IECore::Primitive *primitive, AtNode *shape ) +{ + ConstFloatVectorDataPtr r = radius( primitive ); + + AiNodeSetArray( + shape, + "radius", + AiArrayConvert( r->readable().size(), 1, AI_TYPE_FLOAT, (void *)&( r->readable()[0] ) ) + ); +} + +void convertRadius( const std::vector &samples, AtNode *shape ) +{ + vector radiusSamples; // for ownership + vector dataSamples; // for passing to dataToArray() + radiusSamples.reserve( samples.size() ); + dataSamples.reserve( samples.size() ); + + for( vector::const_iterator it = samples.begin(), eIt = samples.end(); it != eIt; ++it ) + { + ConstFloatVectorDataPtr r = radius( *it ); + radiusSamples.push_back( r ); + dataSamples.push_back( r.get() ); + } + + AtArray *array = ParameterAlgo::dataToArray( dataSamples, AI_TYPE_FLOAT ); + AiNodeSetArray( shape, "radius", array ); +} + +void convertPrimitiveVariable( const IECore::Primitive *primitive, const PrimitiveVariable &primitiveVariable, AtNode *shape, const char *name ) +{ + if( primitiveVariable.interpolation == PrimitiveVariable::Constant ) + { + ParameterAlgo::setParameter( shape, name, primitiveVariable.data.get() ); + } + else + { + bool isArray = false; + int type = ParameterAlgo::parameterType( primitiveVariable.data->typeId(), isArray ); + if( type == AI_TYPE_NONE || !isArray ) + { + msg( + Msg::Warning, + "ToArnoldShapeConverter::convertPrimitiveVariable", + boost::format( "Unable to create user parameter \"%s\" for primitive variable of type \"%s\"" ) % name % primitiveVariable.data->typeName() + ); + return; + } + + std::string typeString; + if( primitiveVariable.interpolation == PrimitiveVariable::Uniform ) + { + typeString = "uniform "; + } + else if( primitiveVariable.interpolation == PrimitiveVariable::Vertex ) + { + typeString = "varying "; + } + else if( primitive->variableSize( primitiveVariable.interpolation ) == primitive->variableSize( PrimitiveVariable::Vertex ) ) + { + typeString = "varying "; + } + + if( typeString == "" ) + { + msg( + Msg::Warning, + "ToArnoldShapeConverter::convertPrimitiveVariable", + boost::format( "Unable to create user parameter \"%s\" because primitive variable has unsupported interpolation" ) % name + ); + return; + } + + typeString += AiParamGetTypeName( type ); + AiNodeDeclare( shape, name, typeString.c_str() ); + AtArray *array = ParameterAlgo::dataToArray( primitiveVariable.data.get() ); + if( array ) + { + AiNodeSetArray( shape, name, array ); + } + else + { + msg( + Msg::Warning, + "ToArnoldShapeConverter::convertPrimitiveVariable", + boost::format( "Failed to create array for parameter \"%s\" from data of type \"%s\"" ) % name % primitiveVariable.data->typeName() + ); + } + } +} + +void convertPrimitiveVariables( const IECore::Primitive *primitive, AtNode *shape, const char **namesToIgnore ) +{ + for( PrimitiveVariableMap::const_iterator it = primitive->variables.begin(), eIt = primitive->variables.end(); it!=eIt; it++ ) + { + if( namesToIgnore ) + { + bool skip = false; + for( const char **n = namesToIgnore; *n; n++ ) + { + if( it->first == *n ) + { + skip = true; + break; + } + } + if( skip ) + { + continue; + } + } + + // we prefix all the names, as otherwise the chance of a conflict between + // an arbitrary primitive variable name and an existing arnold parameter name + // seems too great. + string prefixedName = "user:" + it->first; + convertPrimitiveVariable( primitive, it->second, shape, prefixedName.c_str() ); + } +} + +} // namespace ShapeAlgo + +} // namespace IECoreArnold diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp index 78d54bf9b9..1f2eaeee95 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp @@ -49,7 +49,7 @@ UniverseBlock::UniverseBlock() } AiBegin(); - + const char *pluginPaths = getenv( "ARNOLD_PLUGIN_PATH" ); if( pluginPaths ) { diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp similarity index 82% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp index 3e87f2ffbc..9bdaeb4349 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp @@ -37,24 +37,17 @@ #include "IECoreArnold/bindings/RendererBinding.h" #include "IECoreArnold/bindings/UniverseBlockBinding.h" -#include "IECoreArnold/bindings/ToArnoldConverterBinding.h" -#include "IECoreArnold/bindings/ToArnoldShapeConverterBinding.h" -#include "IECoreArnold/bindings/ToArnoldPointsConverterBinding.h" -#include "IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h" -#include "IECoreArnold/bindings/ToArnoldMeshConverterBinding.h" +#include "IECoreArnold/bindings/NodeAlgoBinding.h" #include "IECoreArnold/bindings/InstancingConverterBinding.h" using namespace IECoreArnold; +using namespace IECoreArnoldBindings; using namespace boost::python; BOOST_PYTHON_MODULE( _IECoreArnold ) { bindRenderer(); bindUniverseBlock(); - bindToArnoldConverter(); - bindToArnoldShapeConverter(); - bindToArnoldPointsConverter(); - bindToArnoldCurvesConverter(); - bindToArnoldMeshConverter(); + bindNodeAlgo(); bindInstancingConverter(); } diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp similarity index 64% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp index 8b59c85633..deb38cb751 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp @@ -33,6 +33,7 @@ ////////////////////////////////////////////////////////////////////////// #include "boost/python.hpp" +#include "boost/python/suite/indexing/container_utils.hpp" // This must come before the Cortex includes, because on OSX headers included // by TBB define macros which conflict with the inline functions in ai_types.h. @@ -42,13 +43,49 @@ #include "IECorePython/ScopedGILRelease.h" #include "IECoreArnold/InstancingConverter.h" -#include "IECoreArnold/bindings/ToArnoldConverterBinding.h" +#include "IECoreArnold/bindings/NodeAlgoBinding.h" #include "IECoreArnold/bindings/InstancingConverterBinding.h" -using namespace IECoreArnold; +using namespace std; using namespace boost::python; +using namespace IECore; +using namespace IECoreArnold; +using namespace IECoreArnoldBindings; + +namespace +{ -static object convertWrapper( InstancingConverter &c, IECore::Primitive *primitive ) +object convertWrapper1( InstancingConverter &c, object pythonSamples, object pythonSampleTimes ) +{ + vector samples; + vector sampleTimes; + boost::python::container_utils::extend_container( samples, pythonSamples ); + boost::python::container_utils::extend_container( sampleTimes, pythonSampleTimes ); + + AtNode *node; + { + IECorePython::ScopedGILRelease gilRelease; + node = c.convert( samples, sampleTimes ); + } + return atNodeToPythonObject( node ); +} + +object convertWrapper2( InstancingConverter &c, object pythonSamples, object pythonSampleTimes, const IECore::MurmurHash &h ) +{ + vector samples; + vector sampleTimes; + boost::python::container_utils::extend_container( samples, pythonSamples ); + boost::python::container_utils::extend_container( sampleTimes, pythonSampleTimes ); + + AtNode *node; + { + IECorePython::ScopedGILRelease gilRelease; + node = c.convert( samples, sampleTimes, h ); + } + return atNodeToPythonObject( node ); +} + +object convertWrapper3( InstancingConverter &c, IECore::Primitive *primitive ) { AtNode *node; { @@ -58,7 +95,7 @@ static object convertWrapper( InstancingConverter &c, IECore::Primitive *primiti return atNodeToPythonObject( node ); } -static object convertWrapper2( InstancingConverter &c, IECore::Primitive *primitive, const IECore::MurmurHash &h ) +object convertWrapper4( InstancingConverter &c, IECore::Primitive *primitive, const IECore::MurmurHash &h ) { AtNode *node; { @@ -68,11 +105,15 @@ static object convertWrapper2( InstancingConverter &c, IECore::Primitive *primit return atNodeToPythonObject( node ); } +} // namespace + void IECoreArnold::bindInstancingConverter() { IECorePython::RefCountedClass( "InstancingConverter" ) .def( init<>() ) - .def( "convert", &convertWrapper ) + .def( "convert", &convertWrapper1 ) .def( "convert", &convertWrapper2 ) + .def( "convert", &convertWrapper3 ) + .def( "convert", &convertWrapper4 ) ; } diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/NodeAlgoBinding.cpp similarity index 64% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/NodeAlgoBinding.cpp index 27718c153f..c9baed8060 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/NodeAlgoBinding.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2016, Image Engine Design Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -32,17 +32,41 @@ // ////////////////////////////////////////////////////////////////////////// -#include "IECoreArnold/ToArnoldConverter.h" -#include "IECoreArnold/bindings/ToArnoldConverterBinding.h" +#include "boost/python/suite/indexing/container_utils.hpp" -#include "IECorePython/RunTimeTypedBinding.h" +#include "IECoreArnold/NodeAlgo.h" +#include "IECoreArnold/bindings/NodeAlgoBinding.h" #include "IECore/Object.h" -using namespace IECoreArnold; using namespace boost::python; +using namespace IECoreArnold; +using namespace IECoreArnoldBindings; + +namespace +{ + +object convertWrapper( const IECore::Object *object ) +{ + return atNodeToPythonObject( NodeAlgo::convert( object ) ); +} + +object convertWrapper2( object pythonSamples, object pythonSampleTimes ) +{ + std::vector samples; + std::vector sampleTimes; + container_utils::extend_container( samples, pythonSamples ); + container_utils::extend_container( sampleTimes, pythonSampleTimes ); + + return atNodeToPythonObject( NodeAlgo::convert( samples, sampleTimes ) ); +} + +} // namespace -boost::python::object IECoreArnold::atNodeToPythonObject( AtNode *node ) +namespace IECoreArnoldBindings +{ + +boost::python::object atNodeToPythonObject( AtNode *node ) { if( !node ) { @@ -51,23 +75,23 @@ boost::python::object IECoreArnold::atNodeToPythonObject( AtNode *node ) object ctypes = import( "ctypes" ); object arnold = import( "arnold" ); - + object atNodeType = arnold.attr( "AtNode" ); object pointerType = ctypes.attr( "POINTER" )( atNodeType ); object converted = ctypes.attr( "cast" )( (size_t)node, pointerType ); return converted; } -static object convertWrapper( ToArnoldConverter &converter ) +void bindNodeAlgo() { - return atNodeToPythonObject( converter.convert() ); -} -void IECoreArnold::bindToArnoldConverter() -{ - IECorePython::RunTimeTypedClass() - .def( "convert", &convertWrapper ) - .def( "create", &ToArnoldConverter::create ) - .staticmethod( "create" ) - ; + object nodeAlgoModule( handle<>( borrowed( PyImport_AddModule( "IECoreArnold.NodeAlgo" ) ) ) ); + scope().attr( "NodeAlgo" ) = nodeAlgoModule; + scope nodeAlgoModuleScope( nodeAlgoModule ); + + def( "convert", &convertWrapper ); + def( "convert", &convertWrapper2 ); + } + +} // namespace IECoreArnoldBindings diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp similarity index 98% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp index b25807b375..fbc1a82612 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp @@ -54,7 +54,7 @@ class ProceduralHolderTranslator : public CShapeTranslator { public : - + virtual AtNode *CreateArnoldNodes() { m_isMasterDag = IsMasterInstance(m_masterDag); @@ -69,7 +69,7 @@ class ProceduralHolderTranslator : public CShapeTranslator return AddArnoldNode( "ginstance" ); } } - + virtual void Export( AtNode *node ) { @@ -117,73 +117,73 @@ class ProceduralHolderTranslator : public CShapeTranslator virtual void ExportProcedural( AtNode *node ) { // do basic node export - + ExportMatrix( node, 0 ); - + AtNode *shader = arnoldShader(); if( shader ) { AiNodeSetPtr( node, "shader", shader ); } - + AiNodeSetInt( node, "visibility", ComputeVisibility() ); - + MPlug plug = FindMayaObjectPlug( "receiveShadows" ); if( !plug.isNull() ) { AiNodeSetBool( node, "receive_shadows", plug.asBool() ); } - + plug = FindMayaObjectPlug( "aiSelfShadows" ); if( !plug.isNull() ) { AiNodeSetBool( node, "self_shadows", plug.asBool() ); } - + plug = FindMayaObjectPlug( "aiOpaque" ); if( !plug.isNull() ) { AiNodeSetBool( node, "opaque", plug.asBool() ); } - + // export any shading groups or displacement shaders which look like they // may be connected to procedural parameters. this ensures that maya shaders // the procedural will expect to find at rendertime will be exported to the // ass file (they otherwise might not be if they're not assigned to any objects). - + exportShadingInputs(); - + // now set the procedural-specific parameters - + MFnDagNode fnDagNode( m_dagPath ); MBoundingBox bound = fnDagNode.boundingBox(); - + AiNodeSetPnt( node, "min", bound.min().x, bound.min().y, bound.min().z ); AiNodeSetPnt( node, "max", bound.max().x, bound.max().y, bound.max().z ); - + const char *dsoPath = getenv( "IECOREARNOLD_PROCEDURAL_PATH" ); AiNodeSetStr( node, "dso", dsoPath ? dsoPath : "ieProcedural.so" ); - + AiNodeDeclare( node, "className", "constant STRING" ); AiNodeDeclare( node, "classVersion", "constant INT" ); AiNodeDeclare( node, "parameterValues", "constant ARRAY STRING" ); - + // cast should be ok as we're registered to only work on procedural holders IECoreMaya::ProceduralHolder *pHolder = static_cast( fnDagNode.userNode() ); - + std::string className; int classVersion; IECore::ParameterisedProceduralPtr procedural = pHolder->getProcedural( &className, &classVersion ); - + AiNodeSetStr( node, "className", className.c_str() ); AiNodeSetInt( node, "classVersion", classVersion ); - + IECorePython::ScopedGILLock gilLock; try { boost::python::object parser = IECoreMaya::PythonCmd::globalContext()["IECore"].attr( "ParameterParser" )(); boost::python::object serialised = parser.attr( "serialise" )( procedural->parameters() ); - + size_t numStrings = IECorePython::len( serialised ); AtArray *stringArray = AiArrayAllocate( numStrings, 1, AI_TYPE_STRING ); for( size_t i=0; i channelNames; - + const char *name = 0; int pixelType = 0; while( AiOutputIteratorGetNext( iterator, &name, &pixelType, 0 ) ) @@ -104,7 +104,7 @@ static void driverOpen( AtNode *node, struct AtOutputIterator *iterator, AtBBox2 { namePrefix = std::string( name ) + "."; } - + switch( pixelType ) { case AI_TYPE_RGB : @@ -137,12 +137,12 @@ static void driverOpen( AtNode *node, struct AtOutputIterator *iterator, AtBBox2 V2i( dataWindow.minx, dataWindow.miny ), V2i( dataWindow.maxx, dataWindow.maxy ) ); - + CompoundDataPtr parameters = new CompoundData(); - ToArnoldConverter::getParameters( node, parameters->writable() ); + ParameterAlgo::getParameters( node, parameters->writable() ); const char *driverType = AiNodeGetStr( node, "driverType" ); - + DisplayDriverPtr *driver = (DisplayDriverPtr *)AiDriverGetLocalData( node ); try { @@ -184,7 +184,7 @@ static void driverWriteBucket( AtNode *node, struct AtOutputIterator *iterator, { return; } - + const int numOutputChannels = (*driver)->channelNames().size(); std::vector interleavedData; @@ -210,7 +210,7 @@ static void driverWriteBucket( AtNode *node, struct AtOutputIterator *iterator, numChannels = 1; break; } - + for( int c = 0; c < numChannels; c++ ) { float *in = (float *)(bucketData) + c; @@ -226,9 +226,9 @@ static void driverWriteBucket( AtNode *node, struct AtOutputIterator *iterator, } outChannelOffset += 1; } - + } - + Box2i bucketBox( V2i( x, y ), V2i( x + sx - 1, y + sy - 1 ) @@ -253,7 +253,7 @@ static void driverClose( AtNode *node, struct AtOutputIterator *iterator ) { try { - (*driver)->imageClose(); + (*driver)->imageClose(); } catch( const std::exception &e ) { @@ -274,8 +274,8 @@ static void driverFinish( AtNode *node ) AI_EXPORT_LIB bool NodeLoader( int i, AtNodeLib *node ) { if( i==0 ) - { - static AtCommonMethods commonMethods = { + { + static AtCommonMethods commonMethods = { driverParameters, driverInitialize, driverUpdate, @@ -299,13 +299,13 @@ AI_EXPORT_LIB bool NodeLoader( int i, AtNodeLib *node ) &commonMethods, &driverMethods }; - + node->node_type = AI_NODE_DRIVER; node->output_type = AI_TYPE_NONE; node->name = "ieDisplay"; node->methods = &nodeMethods; sprintf( node->version, AI_VERSION ); - + return true; } diff --git a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp similarity index 98% rename from cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp rename to cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp index deff535918..335d66305f 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp +++ b/cortex-9.7.0/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp @@ -79,10 +79,10 @@ static void initialisePython() "signal.signal( signal.SIGINT, signal.SIG_DFL )\n" "import IECore"; - handle<> ignored( PyRun_String( + handle<> ignored( PyRun_String( toExecute.c_str(), Py_file_input, g_mainModuleNamespace.ptr(), - g_mainModuleNamespace.ptr() ) ); + g_mainModuleNamespace.ptr() ) ); } catch( const error_already_set &e ) { @@ -99,7 +99,7 @@ static void initialisePython() PyEval_ReleaseThread( PyThreadState_Get() ); } - + static int procInit( AtNode *node, void **userPtr ) { // load the class @@ -109,7 +109,7 @@ static int procInit( AtNode *node, void **userPtr ) const char *className = AiNodeGetStr( node, "className" ); int classVersion = AiNodeGetInt( node, "classVersion" ); AtArray *parameterValues = AiNodeGetArray( node, "parameterValues" ); - + ParameterisedProceduralPtr parameterisedProcedural = 0; ScopedGILLock gilLock; try @@ -117,12 +117,12 @@ static int procInit( AtNode *node, void **userPtr ) object ieCore = g_mainModuleNamespace["IECore"]; object classLoader = ieCore.attr( "ClassLoader" ).attr( "defaultProceduralLoader" )(); object procedural = classLoader.attr( "load" )( className, classVersion )(); - + if( parameterValues ) { boost::python::list toParse; for( unsigned i=0; inelements; i++ ) - { + { // hack to workaround ass parsing errors /// \todo Remove when we get the Arnold version that fixes this std::string s = AiArrayGetStr( parameterValues, i ); @@ -133,14 +133,14 @@ static int procInit( AtNode *node, void **userPtr ) s[c] = '#'; } } - + toParse.append( s ); } - + object parameterParser = ieCore.attr( "ParameterParser" )(); parameterParser.attr( "parse" )( toParse, procedural.attr( "parameters" )() ); } - + parameterisedProcedural = extract( procedural ); } catch( const error_already_set &e ) @@ -155,14 +155,14 @@ static int procInit( AtNode *node, void **userPtr ) { msg( Msg::Error, "ieProcedural", "Caught unknown exception" ); } - + // render with it - + if( parameterisedProcedural ) { IECoreArnold::RendererPtr renderer = new IECoreArnold::Renderer( node ); parameterisedProcedural->render( renderer.get() ); - + renderer->addRef(); *userPtr = renderer.get(); } @@ -170,7 +170,7 @@ static int procInit( AtNode *node, void **userPtr ) { *userPtr = 0; } - + return 1; } @@ -205,6 +205,6 @@ AI_EXPORT_LIB int ProcLoader( AtProcVtable *vTable ) vTable->NumNodes = procNumNodes; vTable->GetNode = procGetNode; strcpy( vTable->version, AI_VERSION ); - + return 1; } diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/All.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/All.py similarity index 97% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/All.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/All.py index 75ff5b505e..3d1ff608cf 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/All.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/All.py @@ -45,9 +45,9 @@ from ProceduralTest import ProceduralTest from OutputDriverTest import OutputDriverTest from PointsTest import PointsTest -from ToArnoldConverterTest import ToArnoldConverterTest from InstancingConverterTest import InstancingConverterTest from AutomaticInstancingTest import AutomaticInstancingTest +from CurvesTest import CurvesTest unittest.TestProgram( testRunner = unittest.TextTestRunner( diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py similarity index 97% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py index 6d64e22307..d0e1c044b5 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py @@ -45,109 +45,109 @@ class AutomaticInstancingTest( unittest.TestCase ) : def __allNodes( self, type = arnold.AI_NODE_ALL ) : - + result = [] i = arnold.AiUniverseGetNodeIterator( type ) while not arnold.AiNodeIteratorFinished( i ) : result.append( arnold.AiNodeIteratorGetNext( i ) ) - + return result def testOnByDefault( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) - + m.render( r ) m.render( r ) - + nodes = self.__allNodes( type = arnold.AI_NODE_SHAPE ) self.assertEqual( len( nodes ), 2 ) - + nodeTypes = [ arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n ) ) for n in nodes ] mesh = nodes[nodeTypes.index( "polymesh" )] instance = nodes[nodeTypes.index( "ginstance" )] - + self.assertEqual( arnold.AiNodeGetPtr( instance, "node" ), ctypes.addressof( mesh.contents ) ) def testEnabling( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + r.setAttribute( "ai:automaticInstancing", IECore.BoolData( True ) ) m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) - + m.render( r ) m.render( r ) - + nodes = self.__allNodes( type = arnold.AI_NODE_SHAPE ) self.assertEqual( len( nodes ), 2 ) - + nodeTypes = [ arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n ) ) for n in nodes ] mesh = nodes[nodeTypes.index( "polymesh" )] instance = nodes[nodeTypes.index( "ginstance" )] - + self.assertEqual( arnold.AiNodeGetPtr( instance, "node" ), ctypes.addressof( mesh.contents ) ) def testDisabling( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + r.setAttribute( "ai:automaticInstancing", IECore.BoolData( False ) ) - + m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) - + m.render( r ) m.render( r ) - + nodes = self.__allNodes( type = arnold.AI_NODE_SHAPE ) self.assertEqual( len( nodes ), 2 ) - + nodeTypes = [ arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n ) ) for n in nodes ] self.assertEqual( nodeTypes, [ "polymesh", "polymesh" ] ) - + def testProceduralsShareInstances( self ) : - + class PlaneProcedural( IECore.Renderer.Procedural ) : - + def __init__( self ) : - + IECore.Renderer.Procedural.__init__( self ) - + def bound( self ) : - + return IECore.Box3f( IECore.V3f( -10, -10, -0.01 ), IECore.V3f( 10, 10, 0.01 ) ) - + def render( self, renderer ) : - + IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -10 ), IECore.V2f( 10 ) ) ).render( renderer ) def hash( self ): - + h = IECore.MurmurHash() return h - + def arnoldMessageCallback( logMask, severity, msg, tabs ) : - + self.__arnoldMessages.append( msg ) - + r = IECoreArnold.Renderer() r.display( "test", "driver_null", "rgba", {} ) messageCallback = arnold.AtMsgCallBack( arnoldMessageCallback ) arnold.AiMsgSetCallback( messageCallback ) self.__arnoldMessages = [] - + with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) for i in range( 0, 100 ) : @@ -157,13 +157,13 @@ def arnoldMessageCallback( logMask, severity, msg, tabs ) : # because it seems that after rendering, arnold reports the type of ginstances # as being the type of the thing they point to, rather than "ginstance". so instead we # check for evidence in the log. - + polyMeshStats = [ m for m in self.__arnoldMessages if m.startswith( "polymeshes" ) ][0] self.failUnless( "99" in polyMeshStats ) - + # check that there are no bounding box warnings boundingBoxWarnings = [ m for m in self.__arnoldMessages if "bounding box" in m ] self.assertEqual( len( boundingBoxWarnings ), 0 ) - + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/CurvesTest.py similarity index 59% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/CurvesTest.py index e5c9c11af8..b41923573d 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/CurvesTest.py @@ -1,6 +1,6 @@ ########################################################################## # -# Copyright (c) 2012, Image Engine Design Inc. All rights reserved. +# Copyright (c) 2016, Image Engine Design Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -32,8 +32,6 @@ # ########################################################################## -from __future__ import with_statement - import unittest import arnold @@ -41,21 +39,41 @@ import IECore import IECoreArnold -class ToArnoldConverterTest( unittest.TestCase ) : - - def testFactory( self ) : - - m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) - c = IECoreArnold.ToArnoldConverter.create( m ) - self.failUnless( isinstance( c, IECoreArnold.ToArnoldMeshConverter ) ) - - cp = IECore.CurvesPrimitive() - c = IECoreArnold.ToArnoldConverter.create( cp ) - self.failUnless( isinstance( c, IECoreArnold.ToArnoldCurvesConverter ) ) - - p = IECore.PointsPrimitive( 1 ) - c = IECoreArnold.ToArnoldConverter.create( p ) - self.failUnless( isinstance( c, IECoreArnold.ToArnoldPointsConverter ) ) - +class CurvesTest( unittest.TestCase ) : + + def testMotion( self ) : + + c1 = IECore.CurvesPrimitive( IECore.IntVectorData( [ 4 ] ) ) + c2 = IECore.CurvesPrimitive( IECore.IntVectorData( [ 4 ] ) ) + + c1["P"] = IECore.PrimitiveVariable( + IECore.PrimitiveVariable.Interpolation.Vertex, + IECore.V3fVectorData( [ IECore.V3f( 1 ) ] * 4 ), + ) + + c2["P"] = IECore.PrimitiveVariable( + IECore.PrimitiveVariable.Interpolation.Vertex, + IECore.V3fVectorData( [ IECore.V3f( 2 ) ] * 4 ), + ) + + with IECoreArnold.UniverseBlock() : + + n = IECoreArnold.NodeAlgo.convert( [ c1, c2 ], [ -0.25, 0.25 ] ) + + a = arnold.AiNodeGetArray( n, "points" ) + self.assertEqual( a.contents.nelements, 4 ) + self.assertEqual( a.contents.nkeys, 2 ) + + for i in range( 0, 4 ) : + self.assertEqual( arnold.AiArrayGetPnt( a, i ), arnold.AtPoint( 1 ) ) + for i in range( 4, 8 ) : + self.assertEqual( arnold.AiArrayGetPnt( a, i ), arnold.AtPoint( 2 ) ) + + a = arnold.AiNodeGetArray( n, "deform_time_samples" ) + self.assertEqual( a.contents.nelements, 2 ) + self.assertEqual( a.contents.nkeys, 1 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 0 ), -0.25 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 1 ), 0.25 ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py similarity index 80% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py index 7086ea7ea4..29e8b3d884 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py @@ -49,37 +49,37 @@ class InstancingConverterTest( unittest.TestCase ) : def test( self ) : with IECoreArnold.UniverseBlock() : - + c = IECoreArnold.InstancingConverter() - + m1 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) m2 = m1.copy() m3 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -2 ), IECore.V2f( 2 ) ) ) - + am1 = c.convert( m1 ) self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( am1 ) ), "polymesh" ) - + am2 = c.convert( m2 ) self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( am2 ) ), "ginstance" ) self.assertEqual( arnold.AiNodeGetPtr( am2, "node" ), ctypes.addressof( am1.contents ) ) - + am3 = c.convert( m3 ) self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( am3 ) ), "polymesh" ) - + def testThreading( self ) : - + with IECoreArnold.UniverseBlock() : - + converter = IECoreArnold.InstancingConverter() - + meshes = [] for i in range( 0, 1000 ) : meshes.append( IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -i ), IECore.V2f( i ) ) ) ) - + def f( nodeList ) : for i in range( 0, 10000 ) : nodeList.append( converter.convert( random.choice( meshes ) ) ) - + nodeLists = [] threads = [] for i in range( 0, 10 ) : @@ -88,49 +88,49 @@ def f( nodeList ) : t = threading.Thread( target = f, args = ( nodeList, ) ) threads.append( t ) t.start() - + for t in threads : t.join() - + numPolyMeshNodes = 0 numInstanceNodes = 0 polyMeshAddresses = set() instancedNodeAddresses = [] for nodeList in nodeLists : - + self.assertEqual( len( nodeList ), 10000 ) - + for node in nodeList : - + nodeType = arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( node ) ) self.failUnless( nodeType in ( "ginstance", "polymesh" ) ) - + if nodeType == "ginstance" : numInstanceNodes += 1 instancedNodeAddresses.append( arnold.AiNodeGetPtr( node, "node" ) ) else : numPolyMeshNodes += 1 polyMeshAddresses.add( ctypes.addressof( node.contents ) ) - + self.assertEqual( numInstanceNodes + numPolyMeshNodes, 10000 * 10 ) for address in instancedNodeAddresses : self.failUnless( address in polyMeshAddresses ) - + def testUserSuppliedHash( self ) : - + with IECoreArnold.UniverseBlock() : - + c = IECoreArnold.InstancingConverter() - + m1 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) m2 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -2 ), IECore.V2f( 2 ) ) ) - - h1 = m1.hash() - h2 = m2.hash() - + + h1 = IECore.MurmurHash() + h2 = IECore.MurmurHash() + h1.append( 10 ) h2.append( 10 ) - + am1a = c.convert( m1, h1 ) self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( am1a ) ), "polymesh" ) am1b = c.convert( m1, h1 ) @@ -143,5 +143,30 @@ def testUserSuppliedHash( self ) : self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( am2b ) ), "ginstance" ) self.assertEqual( arnold.AiNodeGetPtr( am2b, "node" ), ctypes.addressof( am2a.contents ) ) + def testMotion( self ) : + + with IECoreArnold.UniverseBlock() : + + c = IECoreArnold.InstancingConverter() + + m1 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) + m2 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -2 ), IECore.V2f( 2 ) ) ) + + n1 = c.convert( [ m1, m2 ], [ -0.25, 0.25 ] ) + self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n1 ) ), "polymesh" ) + self.assertEqual( arnold.AiNodeGetArray( n1, "vlist" ).contents.nkeys, 2 ) + + n2 = c.convert( [ m1, m2 ], [ -0.25, 0.25 ] ) + self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n2 ) ), "ginstance" ) + self.assertEqual( arnold.AiNodeGetPtr( n2, "node" ), ctypes.addressof( n1.contents ) ) + + n3 = c.convert( [ m2, m1 ], [ -0.25, 0.25 ] ) + self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n1 ) ), "polymesh" ) + self.assertEqual( arnold.AiNodeGetArray( n1, "vlist" ).contents.nkeys, 2 ) + + n4 = c.convert( [ m1, m2 ], [ -0.5, 0.5 ] ) + self.assertEqual( arnold.AiNodeEntryGetName( arnold.AiNodeGetNodeEntry( n1 ) ), "polymesh" ) + self.assertEqual( arnold.AiNodeGetArray( n1, "vlist" ).contents.nkeys, 2 ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py similarity index 72% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py index 599fa1353b..3fcbd28f59 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py @@ -49,61 +49,101 @@ def testUVs( self ) : r = IECoreArnold.Renderer() r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) - with IECore.WorldBlock( r ) : + with IECore.WorldBlock( r ) : r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) r.shader( "surface", "utility", { "shade_mode" : "flat", "color_mode" : "uv" } ) IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ).render( r ) - + del r image = IECore.ImageDisplayDriver.removeStoredImage( "testHandle" ) expectedImage = IECore.EXRImageReader( os.path.dirname( __file__ ) + "/data/meshImages/expectedMeshUVs.exr" ).read() - + self.failIf( IECore.ImageDiffOp()( imageA=image, imageB=expectedImage, maxError=0.003 ).value ) - + def testNormals( self ) : r = IECoreArnold.Renderer() r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) - with IECore.WorldBlock( r ) : + with IECore.WorldBlock( r ) : r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) r.shader( "surface", "utility", { "shade_mode" : "flat", "color_mode" : "n" } ) m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -0.9 ), IECore.V2f( 0.9 ) ) ) m["N"] = IECore.PrimitiveVariable( - IECore.PrimitiveVariable.Interpolation.Vertex, + IECore.PrimitiveVariable.Interpolation.Vertex, IECore.V3fVectorData( [ IECore.V3f( 1, 0, 0 ), IECore.V3f( 1, 0, 0 ), IECore.V3f( 1, 0, 0 ), IECore.V3f( 1, 0, 0 ) ] ) - ) + ) m.render( r ) - + del r image = IECore.ImageDisplayDriver.removeStoredImage( "testHandle" ) - + e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() - + # the utility shader encodes the normals in the range 0-1 rather than -1-1, # which is why we're checking G and B against .5 rather than 0. e.pointAtUV( IECore.V2f( 0.5 ), result ) self.assertAlmostEqual( result.floatPrimVar( e.R() ), 1, 4 ) self.assertAlmostEqual( result.floatPrimVar( e.G() ), 0.5, 4 ) self.assertAlmostEqual( result.floatPrimVar( e.B() ), 0.5, 4 ) - + def testVertexPrimitiveVariables( self ) : - + m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) m["myPrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Vertex, IECore.FloatVectorData( [ 0, 1, 2, 3 ] ) ) - + with IECoreArnold.UniverseBlock() : - n = IECoreArnold.ToArnoldMeshConverter( m ).convert() + n = IECoreArnold.NodeAlgo.convert( m ) a = arnold.AiNodeGetArray( n, "user:myPrimVar" ) self.assertEqual( a.contents.nelements, 4 ) for i in range( 0, 4 ) : self.assertEqual( arnold.AiArrayGetFlt( a, i ), i ) - + + def testMotion( self ) : + + m1 = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) + IECore.MeshNormalsOp()( input = m1, copyInput = False ) + + m2 = m1.copy() + m2["P"].data[0] -= IECore.V3f( 0, 0, 1 ) + m2["P"].data[1] -= IECore.V3f( 0, 0, 1 ) + IECore.MeshNormalsOp()( input = m2, copyInput = False ) + + with IECoreArnold.UniverseBlock() : + + node = IECoreArnold.NodeAlgo.convert( [ m1, m2 ], [ -0.25, 0.25 ] ) + + vList = arnold.AiNodeGetArray( node, "vlist" ) + self.assertEqual( vList.contents.nelements, 4 ) + self.assertEqual( vList.contents.nkeys, 2 ) + + nList = arnold.AiNodeGetArray( node, "nlist" ) + self.assertEqual( nList.contents.nelements, 4 ) + self.assertEqual( nList.contents.nkeys, 2 ) + + for i in range( 0, 4 ) : + p = arnold.AiArrayGetPnt( vList, i ) + self.assertEqual( IECore.V3f( p.x, p.y, p.z ), m1["P"].data[i] ) + n = arnold.AiArrayGetPnt( nList, i ) + self.assertEqual( IECore.V3f( n.x, n.y, n.z ), m1["N"].data[i] ) + + for i in range( 4, 8 ) : + p = arnold.AiArrayGetPnt( vList, i ) + self.assertEqual( IECore.V3f( p.x, p.y, p.z ), m2["P"].data[i-4] ) + n = arnold.AiArrayGetPnt( nList, i ) + self.assertEqual( IECore.V3f( n.x, n.y, n.z ), m2["N"].data[i-4] ) + + a = arnold.AiNodeGetArray( node, "deform_time_samples" ) + self.assertEqual( a.contents.nelements, 2 ) + self.assertEqual( a.contents.nkeys, 1 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 0 ), -0.25 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 1 ), 0.25 ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py similarity index 96% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py index cf731873d4..60a9962b83 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py @@ -47,12 +47,12 @@ def testMergedDisplays( self ) : server = IECore.DisplayDriverServer( 1559 ) time.sleep( 2 ) - - os.system( "kick -dw -dp contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass" ) - + + os.system( "kick -dw -dp contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass" ) + image = IECore.ImageDisplayDriver.removeStoredImage( "mergedImage" ) channelNames = image.keys() - + self.assertEqual( len( channelNames ), 7 ) self.failUnless( "R" in channelNames ) self.failUnless( "G" in channelNames ) @@ -61,17 +61,17 @@ def testMergedDisplays( self ) : self.failUnless( "direct_diffuse.R" in channelNames ) self.failUnless( "direct_diffuse.G" in channelNames ) self.failUnless( "direct_diffuse.B" in channelNames ) - + def testVectorAndPointDisplays( self ) : - + server = IECore.DisplayDriverServer( 1559 ) time.sleep( 2 ) - - os.system( "kick -dw -dp contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass" ) - + + os.system( "kick -dw -dp contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass" ) + image = IECore.ImageDisplayDriver.removeStoredImage( "vectorAndPointImage" ) channelNames = image.keys() - + self.assertEqual( len( channelNames ), 10 ) self.failUnless( "R" in channelNames ) self.failUnless( "G" in channelNames ) @@ -83,8 +83,8 @@ def testVectorAndPointDisplays( self ) : self.failUnless( "N.R" in channelNames ) self.failUnless( "N.G" in channelNames ) self.failUnless( "N.B" in channelNames ) - + IECore.EXRImageWriter( image, "/tmp/test.exr" ).write() - + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py similarity index 74% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py index f9d8b660f1..cb1290034c 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py @@ -44,43 +44,41 @@ class PointsTest( unittest.TestCase ) : def testConverterResultType( self ) : - + with IECoreArnold.UniverseBlock() : - + p = IECore.PointsPrimitive( IECore.V3fVectorData( [ IECore.V3f( i ) for i in range( 0, 10 ) ] ) ) - c = IECoreArnold.ToArnoldPointsConverter( p ) - n = c.convert() - + n = IECoreArnold.NodeAlgo.convert( p ) + self.failUnless( type( n ) is type( arnold.AiNode( "points" ) ) ) def testMode( self ) : - + with IECoreArnold.UniverseBlock() : p = IECore.PointsPrimitive( IECore.V3fVectorData( [ IECore.V3f( i ) for i in range( 0, 10 ) ] ) ) - - c = IECoreArnold.ToArnoldPointsConverter( p ) - n = c.convert() + + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetStr( n, "mode" ), "disk" ) - - p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "particle" ) - n = c.convert() + + p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "particle" ) + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetStr( n, "mode" ), "disk" ) - - p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "disk" ) - n = c.convert() + + p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "disk" ) + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetStr( n, "mode" ), "disk" ) - - p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "sphere" ) - n = c.convert() + + p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "sphere" ) + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetStr( n, "mode" ), "sphere" ) - p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "patch" ) - n = c.convert() + p["type"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, "patch" ) + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetStr( n, "mode" ), "quad" ) - + def testDiskRendering( self ) : - + numPoints = 10 p = IECore.V3fVectorData( numPoints ) random.seed( 0 ) @@ -99,69 +97,110 @@ def testDiskRendering( self ) : } ) r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) - + with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( -2, -2, -10 ) ) ) r.points( numPoints, { "P" : p } ) image = IECore.ImageDisplayDriver.removeStoredImage( "testHandle" ) del image["A"] - + # raise blackPoint massively to remove possible watermark IECore.Grade()( input = image, copyInput = False, blackPoint = IECore.Color3f( 0.9 ) ) - + expectedImage = IECore.Reader.create( os.path.dirname( __file__ ) + "/data/pointsImages/points.tif" ).read() + IECore.ImageWriter.create( image, "/tmp/test.tif" ).write() + self.assertEqual( IECore.ImageDiffOp()( imageA=image, imageB=expectedImage, maxError=0.01 ), IECore.BoolData( False ) ) def testConstantPrimitiveVariable( self ) : - + p = IECore.PointsPrimitive( IECore.V3fVectorData( 10 ) ) p["myPrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.IntData( 10 ) ) - + with IECoreArnold.UniverseBlock() : - n = IECoreArnold.ToArnoldPointsConverter( p ).convert() + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetInt( n, "user:myPrimVar" ), 10 ) - + def testConstantArrayPrimitiveVariable( self ) : - + p = IECore.PointsPrimitive( IECore.V3fVectorData( 10 ) ) p["myPrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.IntVectorData( range( 0, 10 ) ) ) - + with IECoreArnold.UniverseBlock() : - n = IECoreArnold.ToArnoldPointsConverter( p ).convert() + n = IECoreArnold.NodeAlgo.convert( p ) a = arnold.AiNodeGetArray( n, "user:myPrimVar" ) self.assertEqual( a.contents.nelements, 10 ) for i in range( 0, 10 ) : self.assertEqual( arnold.AiArrayGetInt( a, i ), i ) - + def testUniformPrimitiveVariable( self ) : - + p = IECore.PointsPrimitive( IECore.V3fVectorData( 10 ) ) p["myPrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Uniform, IECore.IntVectorData( range( 0, 10 ) ) ) - + with IECoreArnold.UniverseBlock() : - n = IECoreArnold.ToArnoldPointsConverter( p ).convert() + n = IECoreArnold.NodeAlgo.convert( p ) a = arnold.AiNodeGetArray( n, "user:myPrimVar" ) self.assertEqual( a.contents.nelements, 10 ) for i in range( 0, 10 ) : self.assertEqual( arnold.AiArrayGetInt( a, i ), i ) - + def testBooleanPrimitiveVariable( self ) : - + p = IECore.PointsPrimitive( IECore.V3fVectorData( 10 ) ) p["truePrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.BoolData( True ) ) p["falsePrimVar"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.BoolData( False ) ) - + with IECoreArnold.UniverseBlock() : - n = IECoreArnold.ToArnoldPointsConverter( p ).convert() + n = IECoreArnold.NodeAlgo.convert( p ) self.assertEqual( arnold.AiNodeGetBool( n, "user:truePrimVar" ), True ) self.assertEqual( arnold.AiNodeGetBool( n, "user:falsePrimVar" ), False ) - + + def testMotion( self ) : + + p1 = IECore.PointsPrimitive( IECore.V3fVectorData( [ IECore.V3f( 10 ) ] * 10 ) ) + p1["width"] = IECore.PrimitiveVariable( + IECore.PrimitiveVariable.Interpolation.Vertex, + IECore.FloatVectorData( [ 1 ] * 10 ), + ) + + p2 = IECore.PointsPrimitive( IECore.V3fVectorData( [ IECore.V3f( 20 ) ] * 10 ) ) + p2["width"] = IECore.PrimitiveVariable( + IECore.PrimitiveVariable.Interpolation.Vertex, + IECore.FloatVectorData( [ 2 ] * 10 ), + ) + + with IECoreArnold.UniverseBlock() : + + n = IECoreArnold.NodeAlgo.convert( [ p1, p2 ], [ -0.25, 0.25 ] ) + + a = arnold.AiNodeGetArray( n, "points" ) + self.assertEqual( a.contents.nelements, 10 ) + self.assertEqual( a.contents.nkeys, 2 ) + + r = arnold.AiNodeGetArray( n, "radius" ) + self.assertEqual( a.contents.nelements, 10 ) + self.assertEqual( a.contents.nkeys, 2 ) + + for i in range( 0, 10 ) : + self.assertEqual( arnold.AiArrayGetPnt( a, i ), arnold.AtPoint( 10 ) ) + self.assertEqual( arnold.AiArrayGetFlt( r, i ), 0.5 ) + for i in range( 11, 20 ) : + self.assertEqual( arnold.AiArrayGetPnt( a, i ), arnold.AtPoint( 20 ) ) + self.assertEqual( arnold.AiArrayGetFlt( r, i ), 1 ) + + a = arnold.AiNodeGetArray( n, "deform_time_samples" ) + self.assertEqual( a.contents.nelements, 2 ) + self.assertEqual( a.contents.nkeys, 1 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 0 ), -0.25 ) + self.assertEqual( arnold.AiArrayGetFlt( a, 1 ), 0.25 ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py index fa5179b711..0ac2758efd 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py @@ -43,20 +43,20 @@ class ProceduralDSOTest( unittest.TestCase ) : def test( self ) : - + os.system( "kick -dw -dp contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass" ) - + image = IECore.EXRImageReader( "testProceduralDSO.exr" ).read() evaluator = IECore.ImagePrimitiveEvaluator( image ) result = evaluator.createResult() evaluator.pointAtUV( IECore.V2f( 0.5, 0.5 ), result ) self.failUnless( result.floatPrimVar( image["A"] ) > 0.99 ) - + def tearDown( self ) : - + for f in [ "testProceduralDSO.exr" ] : if os.path.exists( f ) : os.remove( f ) - + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py similarity index 95% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py index b095c75108..f5ae55cf93 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py @@ -40,101 +40,101 @@ import IECore import IECoreArnold - + class ProceduralTest( unittest.TestCase ) : - + class SphereProcedural( IECore.Renderer.Procedural ) : - + def __init__( self, radius=1 ) : - + IECore.Renderer.Procedural.__init__( self ) - + self.__radius = radius - + def bound( self ) : - + return IECore.Box3f( IECore.V3f( -self.__radius ), IECore.V3f( self.__radius ) ) - + def render( self, renderer ) : - + renderer.sphere( self.__radius, -1, 1, 360, {} ) - + def hash( self ): - + h = IECore.MurmurHash() return h - + class TransformingProcedural( IECore.Renderer.Procedural ) : - + def __init__( self, transform, child ) : - + IECore.Renderer.Procedural.__init__( self ) - + self.__transform = transform self.__child = child - + def bound( self ) : - + b = self.__child.bound() b = b.transform( self.__transform ) return b - + def render( self, renderer ) : - + with IECore.TransformBlock( renderer ) : - + renderer.concatTransform( self.__transform ) if isinstance( self.__child, IECore.VisibleRenderable ) : self.__child.render( renderer ) else : renderer.procedural( self.__child ) - + def hash( self ): - + h = IECore.MurmurHash() return h - + class ShaderProcedural( IECore.Renderer.Procedural ) : - + def __init__( self, shader, child ) : - + IECore.Renderer.Procedural.__init__( self ) - + self.__shader = shader self.__child = child - + def bound( self ) : - + return self.__child.bound() - + def render( self, renderer ) : - + with IECore.AttributeBlock( renderer ) : - + self.__shader.render( renderer ) renderer.procedural( self.__child ) - + def hash( self ): - + h = IECore.MurmurHash() return h - + def arnoldMessageCallback( self, logMask, severity, msg, tabs ) : - + self.__arnoldMessages += msg def testTransformingProceduralBounds( self ) : - + r = IECoreArnold.Renderer() - + messageCallback = arnold.AtMsgCallBack( self.arnoldMessageCallback ) arnold.AiMsgSetCallback( messageCallback ) self.__arnoldMessages = "" - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) - - with IECore.WorldBlock( r ) : - + + with IECore.WorldBlock( r ) : + r.procedural( self.TransformingProcedural( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ), @@ -143,18 +143,18 @@ def testTransformingProceduralBounds( self ) : ) self.failIf( "incorrect user bounds" in self.__arnoldMessages ) - + def testNestedTransformingProceduralBounds( self ) : - + r = IECoreArnold.Renderer() r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) messageCallback = arnold.AtMsgCallBack( self.arnoldMessageCallback ) arnold.AiMsgSetCallback( messageCallback ) self.__arnoldMessages = "" - - with IECore.WorldBlock( r ) : - + + with IECore.WorldBlock( r ) : + r.procedural( self.TransformingProcedural( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ), @@ -164,16 +164,16 @@ def testNestedTransformingProceduralBounds( self ) : ) ) ) - - self.failIf( "incorrect user bounds" in self.__arnoldMessages ) + + self.failIf( "incorrect user bounds" in self.__arnoldMessages ) def testProceduralInheritsShader( self ) : - + r = IECoreArnold.Renderer() r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) with IECore.WorldBlock( r ) : - + r.procedural( self.ShaderProcedural( IECore.Shader( "flat", "surface", { "color" : IECore.Color3f( 0, 1, 0 ) } ), @@ -182,28 +182,28 @@ def testProceduralInheritsShader( self ) : ) i = IECore.ImageDisplayDriver.removeStoredImage( "testHandle" ) - + e = IECore.ImagePrimitiveEvaluator( i ) r = e.createResult() self.assertEqual( e.pointAtUV( IECore.V2f( 0.5 ), r ), True ) self.assertEqual( r.floatPrimVar( e.R() ), 0 ) self.assertEqual( r.floatPrimVar( e.G() ), 1 ) self.assertEqual( r.floatPrimVar( e.B() ), 0 ) - + def testEmptyProceduralIsIgnored( self ) : - + class EmptyProcedural( IECore.Renderer.Procedural ) : - + def __init__( self ) : - + IECore.Renderer.Procedural.__init__( self ) - + def bound( self ) : - + return IECore.Box3f() - + def render( self, renderer ) : - + pass def hash( self ): @@ -217,11 +217,11 @@ def hash( self ): messageCallback = arnold.AtMsgCallBack( self.arnoldMessageCallback ) arnold.AiMsgSetCallback( messageCallback ) self.__arnoldMessages = "" - - with IECore.WorldBlock( r ) : - + + with IECore.WorldBlock( r ) : + r.procedural( EmptyProcedural() ) - + self.failIf( "ignoring parameter max" in self.__arnoldMessages ) def testNoBound( self ) : diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py similarity index 90% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py index 3726615d90..e3a8305127 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py @@ -47,7 +47,7 @@ class RendererTest( unittest.TestCase ) : __displayFileName = "contrib/IECoreArnold/test/IECoreArnold/output.tif" __assFileName = "contrib/IECoreArnold/test/IECoreArnold/output.ass" - + def testTypeId( self ) : self.assertEqual( IECoreArnold.Renderer().typeId(), IECoreArnold.Renderer.staticTypeId() ) @@ -59,113 +59,113 @@ def testTypeName( self ) : self.assertEqual( r.typeName(), "IECoreArnold::Renderer" ) def testOptions( self ) : - + r = IECoreArnold.Renderer() - + # check we can set an already existing int self.assertEqual( r.getOption( "ai:AA_samples" ), IECore.IntData( 1 ) ) r.setOption( "ai:AA_samples", IECore.IntData( 11 ) ) self.assertEqual( r.getOption( "ai:AA_samples" ), IECore.IntData( 11 ) ) - + # check we can set an already existing float self.assertEqual( r.getOption( "ai:auto_transparency_threshold" ), IECore.FloatData( .99 ) ) r.setOption( "ai:auto_transparency_threshold", IECore.FloatData( .9 ) ) self.assertEqual( r.getOption( "ai:auto_transparency_threshold" ), IECore.FloatData( .9 ) ) - + # check tbat trying to set nonexistent options yields a message m = IECore.CapturingMessageHandler() with m : - + r.setOption( "ai:thisIsNotAnArnoldOption", IECore.IntData( 10 ) ) self.assertEqual( len( m.messages ), 1 ) self.assertEqual( m.messages[-1].level, IECore.Msg.Level.Warning ) self.assertEqual( m.messages[-1].message, "Unknown option \"ai:thisIsNotAnArnoldOption\"." ) - + # check that setting user options works r.setOption( "user:myLovelyUserOption", IECore.StringData( "oooh!" ) ) self.assertEqual( r.getOption( "user:myLovelyUserOption" ), IECore.StringData( "oooh!" ) ) - + # check that set/get for other renderers is ignored r.setOption( "ri:pixelSamples", IECore.V2iData( IECore.V2i( 1, 1 ) ) ) self.assertEqual( r.getOption( "ri:pixelSamples" ), None ) def testDisplay( self ) : - + r = IECoreArnold.Renderer() - + self.failIf( os.path.exists( self.__displayFileName ) ) r.display( self.__displayFileName, "driver_tiff", "rgba", {} ) - + with IECore.WorldBlock( r ) : - + r.sphere( 1, -1, 1, 360, {} ) - + self.failUnless( os.path.exists( self.__displayFileName ) ) def testDisplayTypeMapping( self ) : - + r = IECoreArnold.Renderer() - + self.failIf( os.path.exists( self.__displayFileName ) ) r.display( self.__displayFileName, "tiff", "rgba", {} ) - + with IECore.WorldBlock( r ) : - + r.sphere( 1, -1, 1, 360, {} ) - + self.failUnless( os.path.exists( self.__displayFileName ) ) def testDisplayDriverIntegration( self ) : - + r = IECoreArnold.Renderer() r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "testHandle" } ) - + with IECore.WorldBlock( r ) : - + r.sphere( 1, -1, 1, 360, {} ) - + self.failUnless( IECore.ImageDisplayDriver.removeStoredImage( "testHandle" ) ) def testASSOutput( self ) : - + r = IECoreArnold.Renderer( self.__assFileName ) self.failIf( os.path.exists( self.__assFileName ) ) with IECore.WorldBlock( r ) : - + r.sphere( 1, -1, 1, 360, {} ) - + self.failUnless( os.path.exists( self.__assFileName ) ) def testUserAttributes( self ) : - + r = IECoreArnold.Renderer() - + r.setAttribute( "user:a", IECore.IntData( 10 ) ) self.assertEqual( r.getAttribute( "user:a" ), IECore.IntData( 10 ) ) - + with IECore.WorldBlock( r ) : - + self.assertEqual( r.getAttribute( "user:a" ), IECore.IntData( 10 ) ) - + r.setAttribute( "user:a", IECore.IntData( 20 ) ) self.assertEqual( r.getAttribute( "user:a" ), IECore.IntData( 20 ) ) - + with IECore.AttributeBlock( r ) : - + r.setAttribute( "user:a", IECore.IntData( 30 ) ) self.assertEqual( r.getAttribute( "user:a" ), IECore.IntData( 30 ) ) - + self.assertEqual( r.getAttribute( "user:a" ), IECore.IntData( 20 ) ) def testShader( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.shader( "surface", "standard", { "emission" : 1.0, "emission_color" : IECore.Color3f( 1, 0, 0 ) } ) r.sphere( 1, -1, 1, 360, {} ) @@ -178,20 +178,20 @@ def testShader( self ) : self.assertAlmostEqual( result.floatPrimVar( e.R() ), 1, 5 ) self.assertEqual( result.floatPrimVar( e.G() ), 0 ) self.assertEqual( result.floatPrimVar( e.B() ), 0 ) - + def testReferenceExistingShader( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + shader = arnold.AiNode( "standard" ) arnold.AiNodeSetStr( shader, "name", "red_shader" ) arnold.AiNodeSetFlt( shader, "emission", 1 ) arnold.AiNodeSetRGB( shader, "emission_color", 1, 0, 0 ) - + r.shader( "surface", "reference:red_shader", {} ) r.sphere( 1, -1, 1, 360, {} ) @@ -203,124 +203,124 @@ def testReferenceExistingShader( self ) : self.assertAlmostEqual( result.floatPrimVar( e.A() ), 1, 5 ) self.assertAlmostEqual( result.floatPrimVar( e.R() ), 1, 5 ) self.assertEqual( result.floatPrimVar( e.G() ), 0 ) - self.assertEqual( result.floatPrimVar( e.B() ), 0 ) + self.assertEqual( result.floatPrimVar( e.B() ), 0 ) def testNonexistentReferencedShader( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + m = IECore.CapturingMessageHandler() with m : r.shader( "surface", "reference:doesntExist", {} ) - + self.assertEqual( len( m.messages ), 1 ) self.failUnless( "Couldn't find shader" in m.messages[0].message ) def testUnloadableShader( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + m = IECore.CapturingMessageHandler() with m : r.shader( "surface", "thisShaderDoesNotExist", {} ) - + self.assertEqual( len( m.messages ), 1 ) def testUnsupportedShaderType( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + m = IECore.CapturingMessageHandler() with m : r.shader( "thisShaderTypeDoesntExist", "utility", {} ) - + self.assertEqual( len( m.messages ), 1 ) - + def testOtherRendererShaderType( self ) : - + r = IECoreArnold.Renderer() - + with IECore.WorldBlock( r ) : - + m = IECore.CapturingMessageHandler() with m : r.shader( "ri:surface", "something", {} ) - - self.assertEqual( len( m.messages ), 0 ) - + + self.assertEqual( len( m.messages ), 0 ) + def testDefaultCamera( self ) : - + # render a plane at z==0 and check we can't see it with the default camera - + m = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -0.1 ), IECore.V2f( 0.1 ) ) ) - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) r.setOption( "ai:AA_samples", IECore.IntData( 3 ) ) - + with IECore.WorldBlock( r ) : m.render( r ) - + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) self.assertEqual( image.dataWindow, IECore.Box2i( IECore.V2i( 0 ), IECore.V2i( 639, 479 ) ) ) - + e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() e.pointAtUV( IECore.V2f( 0.5, 0.5 ), result ) self.failUnless( result.floatPrimVar( image["A"] ) < 0.5 ) # move the plane back a touch and check we can see it with the default camera - + del r # must destroy the existing renderer before making a new one - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) r.setOption( "ai:AA_samples", IECore.IntData( 3 ) ) - + with IECore.WorldBlock( r ) : with IECore.TransformBlock( r ) : r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -1 ) ) ) m.render( r ) - + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) self.assertEqual( image.dataWindow, IECore.Box2i( IECore.V2i( 0 ), IECore.V2i( 639, 479 ) ) ) - + e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() e.pointAtUV( IECore.V2f( 0.5, 0.5 ), result ) self.failUnless( result.floatPrimVar( image["A"] ) > 0.9 ) # move the camera back a touch and check we can see the plane at z==0 - + del r # must destroy the existing renderer before making a new one - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) r.setOption( "ai:AA_samples", IECore.IntData( 3 ) ) - + with IECore.TransformBlock( r ) : r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, 1 ) ) ) r.camera( "main", {} ) - + with IECore.WorldBlock( r ) : m.render( r ) - + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) self.assertEqual( image.dataWindow, IECore.Box2i( IECore.V2i( 0 ), IECore.V2i( 639, 479 ) ) ) - + e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() e.pointAtUV( IECore.V2f( 0.5, 0.5 ), result ) - self.failUnless( result.floatPrimVar( image["A"] ) > 0.9 ) + self.failUnless( result.floatPrimVar( image["A"] ) > 0.9 ) def testCameraXYOrientation( self ) : @@ -335,10 +335,10 @@ def testCameraXYOrientation( self ) : r.camera( "main", { "resolution" : IECore.V2iData( IECore.V2i( 512 ) ) } ) with IECore.WorldBlock( r ) : - + r.shader( "surface", "utility", { "color" : IECore.Color3f( 1, 0, 0 ) } ) IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( 0.75, -0.25 ), IECore.V2f( 1.25, 0.25 ) ) ).render( r ) - + r.shader( "surface", "utility", { "color" : IECore.Color3f( 0, 1, 0 ) } ) IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -0.25, 0.75 ), IECore.V2f( 0.25, 1.25 ) ) ).render( r ) @@ -364,22 +364,22 @@ def testCameraXYOrientation( self ) : self.assertEqual( result.floatPrimVar( b ), 0 ) def testCameraAspectRatio( self ) : - + r = IECoreArnold.Renderer() - - r.camera( "main", { "resolution" : IECore.V2i( 640, 480 ), "screenWindow" : IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 640, 480 ) ) } ) + + r.camera( "main", { "resolution" : IECore.V2i( 640, 480 ), "screenWindow" : IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 640, 480 ) ) } ) r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) - + with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) r.shader( "surface", "utility", { "shading_mode" : "flat", "color" : IECore.Color3f( 1, 0, 0 ) } ) IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( 2 ), IECore.V2f( 638, 478 ) ) ).render( r ) - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -1 ) ) ) r.shader( "surface", "utility", { "shade_mode" : "flat", "color" : IECore.Color3f( 0, 1, 0 ) } ) IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 640, 480 ) ) ).render( r ) - + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) self.failUnless( image is not None ) @@ -387,89 +387,89 @@ def testCameraAspectRatio( self ) : result = e.createResult() r = e.R() g = e.G() - + edges = [ IECore.V2i( 0 ), IECore.V2i( 320, 0 ), - IECore.V2i( 639, 0 ), - IECore.V2i( 639, 240 ), + IECore.V2i( 639, 0 ), + IECore.V2i( 639, 240 ), IECore.V2i( 639, 479 ), IECore.V2i( 320, 479 ), IECore.V2i( 0, 479 ), IECore.V2i( 0, 240 ), ] - - for point in edges : + + for point in edges : self.failUnless( e.pointAtPixel( point, result ) ) self.failUnless( result.floatPrimVar( r ) < 0.1 ) self.failUnless( result.floatPrimVar( g ) > 0.8 ) - + innerEdges = [ IECore.V2i( 3, 3 ), IECore.V2i( 320, 3 ), - IECore.V2i( 637, 3 ), - IECore.V2i( 636, 240 ), + IECore.V2i( 637, 3 ), + IECore.V2i( 636, 240 ), IECore.V2i( 636, 477 ), IECore.V2i( 320, 477 ), IECore.V2i( 3, 477 ), IECore.V2i( 3, 240 ), ] - + for point in innerEdges : self.failUnless( e.pointAtPixel( point, result ) ) self.failUnless( result.floatPrimVar( r ) > 0.8 ) self.failUnless( result.floatPrimVar( g ) < 0.1 ) - + def testProcedural( self ) : - + attributeValues = [] - + class TestProcedural( IECore.Renderer.Procedural ) : - + def __init__( self ) : - + IECore.Renderer.Procedural.__init__( self ) - + def bound( self ) : - + return IECore.Box3f( IECore.V3f( -1 ), IECore.V3f( 1 ) ) - + def render( self, renderer ) : - + t = renderer.getAttribute( "user:test" ).value attributeValues.append( t ) renderer.sphere( 1, -1, 1, 360, {} ) - + def hash( self ): - + h = IECore.MurmurHash() return h - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) - + with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) - + r.setAttribute( "user:test", IECore.IntData( 0 ) ) r.procedural( TestProcedural() ) r.setAttribute( "user:test", IECore.IntData( 1 ) ) r.procedural( TestProcedural() ) - + self.assertEqual( len( attributeValues ), 2 ) self.failUnless( 1 in attributeValues ) self.failUnless( 0 in attributeValues ) - + def performCurvesTest( self, curvesPrimitive, expectedImage ) : - + r = IECoreArnold.Renderer() - + r.setOption( "ai:AA_samples", IECore.IntData( 3 ) ) r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) - + with IECore.TransformBlock( r ) : r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, 2 ) ) ) r.camera( @@ -481,21 +481,21 @@ def performCurvesTest( self, curvesPrimitive, expectedImage ) : } ) - with IECore.WorldBlock( r ) : + with IECore.WorldBlock( r ) : curvesPrimitive.render( r ) image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) del image["A"] - + # raise blackPoint massively to remove possible watermark IECore.Grade()( input = image, copyInput = False, blackPoint = IECore.Color3f( 0.9 ) ) - + expectedImage = IECore.Reader.create( expectedImage ).read() - + self.assertEqual( IECore.ImageDiffOp()( imageA=image, imageB=expectedImage, maxError=0.01 ), IECore.BoolData( False ) ) - + def testBezierCurves( self ) : - + c = IECore.CurvesPrimitive( IECore.IntVectorData( [ 4 ] ), @@ -514,9 +514,9 @@ def testBezierCurves( self ) : c["width"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.FloatData( 0.05 ) ) self.performCurvesTest( c, "contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr" ) - + def testBSplineCurves( self ) : - + c = IECore.CurvesPrimitive( IECore.IntVectorData( [ 4 ] ), @@ -535,9 +535,9 @@ def testBSplineCurves( self ) : c["width"] = IECore.PrimitiveVariable( IECore.PrimitiveVariable.Interpolation.Constant, IECore.FloatData( 0.05 ) ) self.performCurvesTest( c, "contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr" ) - + def testVisibilityAttributes( self ) : - + r = IECoreArnold.Renderer() self.assertEqual( r.getAttribute( "ai:visibility:camera" ), IECore.BoolData( True ) ) self.assertEqual( r.getAttribute( "ai:visibility:shadow" ), IECore.BoolData( True ) ) @@ -545,139 +545,139 @@ def testVisibilityAttributes( self ) : self.assertEqual( r.getAttribute( "ai:visibility:refracted" ), IECore.BoolData( True ) ) self.assertEqual( r.getAttribute( "ai:visibility:diffuse" ), IECore.BoolData( True ) ) self.assertEqual( r.getAttribute( "ai:visibility:glossy" ), IECore.BoolData( True ) ) - + r.setAttribute( "ai:visibility:shadow", IECore.BoolData( False ) ) self.assertEqual( r.getAttribute( "ai:visibility:shadow" ), IECore.BoolData( False ) ) - + def __displacementRender( self, doDisplacement ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) - + r.setAttribute( "ai:polymesh:subdiv_iterations", IECore.IntData( 5 ) ) - - r.shader( "surface", "utility", { "color_mode" : IECore.StringData( "ng" ), "shade_mode" : IECore.StringData( "flat" ) } ) + + r.shader( "surface", "utility", { "color_mode" : IECore.StringData( "ng" ), "shade_mode" : IECore.StringData( "flat" ) } ) if doDisplacement : r.shader( "displacement", "noise", {} ) - + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -2 ), IECore.V2f( 2 ) ) ) mesh.interpolation = "catmullClark" mesh.render( r ) return IECore.ImageDisplayDriver.removeStoredImage( "test" ) - + def testDisplacementShader( self ) : - + undisplaced1 = self.__displacementRender( doDisplacement = False ) undisplaced2 = self.__displacementRender( doDisplacement = False ) - + displaced1 = self.__displacementRender( doDisplacement = True ) - displaced2 = self.__displacementRender( doDisplacement = True ) + displaced2 = self.__displacementRender( doDisplacement = True ) self.assertEqual( IECore.ImageDiffOp()( imageA=undisplaced1, imageB=undisplaced2, maxError=0.001 ), IECore.BoolData( False ) ) self.assertEqual( IECore.ImageDiffOp()( imageA=displaced1, imageB=displaced2, maxError=0.001 ), IECore.BoolData( False ) ) - + self.assertEqual( IECore.ImageDiffOp()( imageA=displaced1, imageB=undisplaced1, maxError=0.1 ), IECore.BoolData( True ) ) - + def __allNodes( self, type = arnold.AI_NODE_ALL ) : - + result = [] i = arnold.AiUniverseGetNodeIterator( type ) while not arnold.AiNodeIteratorFinished( i ) : result.append( arnold.AiNodeIteratorGetNext( i ) ) - + return result - + def testShapeAttributes( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) - + r.setAttribute( "ai:polymesh:subdiv_iterations", IECore.IntData( 10 ) ) - + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -2 ), IECore.V2f( 2 ) ) ) mesh.render( r ) - + shapes = self.__allNodes( type = arnold.AI_NODE_SHAPE ) self.assertEqual( len( shapes ), 1 ) self.assertEqual( arnold.AiNodeGetInt( shapes[0], "subdiv_iterations" ), 10 ) - + def testShaderConnections( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) - + r.shader( "shader", "flat", { "color" : IECore.Color3f( 1, 0, 0 ), "__handle" : "myInputShader" } ) - r.shader( "surface", "standard", { "emission" : 1.0, "emission_color" : "link:myInputShader" } ) - + r.shader( "surface", "standard", { "emission" : 1.0, "emission_color" : "link:myInputShader" } ) + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) mesh.render( r ) image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() - + e.pointAtUV( IECore.V2f( 0.5 ), result ) self.assertAlmostEqual( result.floatPrimVar( e.R() ), 1, 5 ) self.assertEqual( result.floatPrimVar( e.G() ), 0 ) self.assertEqual( result.floatPrimVar( e.B() ), 0 ) - + def testMissingShaderConnectionWarnings( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) - + m = IECore.CapturingMessageHandler() with m : r.shader( "shader", "flat", { "color" : IECore.Color3f( 1, 0, 0 ), "__handle" : "myInputShader" } ) - r.shader( "surface", "standard", { "emission" : 1.0, "emission_color" : "link:oopsWrongOne" } ) - + r.shader( "surface", "standard", { "emission" : 1.0, "emission_color" : "link:oopsWrongOne" } ) + self.assertEqual( len( m.messages ), 1 ) self.assertEqual( m.messages[0].level, IECore.Msg.Level.Warning ) self.failUnless( "oopsWrongOne" in m.messages[0].message ) - + def testLight( self ) : - + r = IECoreArnold.Renderer() - + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) with IECore.WorldBlock( r ) : - + r.light( "point_light", "handle", { "intensity" : 1, "color" : IECore.Color3f( 1, 0.5, 0.25 ) } ) - + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -1 ) ) ) - - r.shader( "surface", "standard", {} ) - + + r.shader( "surface", "standard", {} ) + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1 ), IECore.V2f( 1 ) ) ) mesh.render( r ) image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) e = IECore.PrimitiveEvaluator.create( image ) result = e.createResult() - + e.pointAtUV( IECore.V2f( 0.5 ), result ) self.assertTrue( result.floatPrimVar( e.R() ) > 0.2 ) self.assertAlmostEqual( result.floatPrimVar( e.R() ) * 0.5, result.floatPrimVar( e.G() ) ) @@ -688,7 +688,7 @@ def testExternalProcedural( self ) : r = IECoreArnold.Renderer( self.__assFileName ) with IECore.WorldBlock( r ) : - + r.procedural( r.ExternalProcedural( "test.so", @@ -748,6 +748,63 @@ def testLightPrefixes( self ) : self.assertTrue( "spot_light" in ass ) self.assertTrue( "point_light" not in ass ) + def testDeformationMotionBlur( self ) : + + r = IECoreArnold.Renderer() + + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) + r.setOption( "ai:AA_samples", IECore.IntData( 10 ) ) + + r.camera( "main", { "resolution" : IECore.V2i( 128, 128 ), "shutter" : IECore.V2f( 0, 1 ) } ) + + with IECore.WorldBlock( r ) : + + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) + + with IECore.MotionBlock( r, [ 0, 1 ] ) : + + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -1.5, -0.5 ), IECore.V2f( -0.5, 0.5 ) ) ) + mesh.render( r ) + + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( 0.5, -0.5 ), IECore.V2f( 1.5, 0.5 ) ) ) + mesh.render( r ) + + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) + e = IECore.PrimitiveEvaluator.create( image ) + result = e.createResult() + + e.pointAtUV( IECore.V2f( 0.5 ), result ) + self.assertAlmostEqual( result.floatPrimVar( e.A() ), 0.5, 2 ) + + def testTransformationMotionBlur( self ) : + + r = IECoreArnold.Renderer() + + r.display( "test", "ieDisplay", "rgba", { "driverType" : "ImageDisplayDriver", "handle" : "test" } ) + r.setOption( "ai:AA_samples", IECore.IntData( 10 ) ) + + r.camera( "main", { "resolution" : IECore.V2i( 128, 128 ), "shutter" : IECore.V2f( 0, 1 ) } ) + + with IECore.WorldBlock( r ) : + + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 0, 0, -5 ) ) ) + + with IECore.MotionBlock( r, [ 0, 1 ] ) : + + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( -1, 0, 0 ) ) ) + r.concatTransform( IECore.M44f.createTranslated( IECore.V3f( 1, 0, 0 ) ) ) + + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( -0.5 ), IECore.V2f( 0.5 ) ) ) + mesh.render( r ) + + + image = IECore.ImageDisplayDriver.removeStoredImage( "test" ) + e = IECore.PrimitiveEvaluator.create( image ) + result = e.createResult() + + e.pointAtUV( IECore.V2f( 0.5 ), result ) + self.assertAlmostEqual( result.floatPrimVar( e.A() ), 0.5, 2 ) + def tearDown( self ) : for f in [ @@ -756,6 +813,6 @@ def tearDown( self ) : ] : if os.path.exists( f ) : os.remove( f ) - + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py similarity index 99% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py index 5707cc8b2f..9d46e6b3dc 100644 --- a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py +++ b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py @@ -45,17 +45,17 @@ class UniverseBlockTest( unittest.TestCase ) : def test( self ) : self.failIf( arnold.AiUniverseIsActive() ) - + with IECoreArnold.UniverseBlock() : self.failUnless( arnold.AiUniverseIsActive() ) - + with IECoreArnold.UniverseBlock() : - + self.failUnless( arnold.AiUniverseIsActive() ) - + self.failUnless( arnold.AiUniverseIsActive() ) - + self.failIf( arnold.AiUniverseIsActive() ) if __name__ == "__main__": diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr diff --git a/cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif b/cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif similarity index 100% rename from cortex-9.6.0/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif rename to cortex-9.7.0/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif diff --git a/cortex-9.6.0/contrib/IECoreHoudini/CMakeLists.txt b/cortex-9.7.0/contrib/IECoreHoudini/CMakeLists.txt similarity index 100% rename from cortex-9.6.0/contrib/IECoreHoudini/CMakeLists.txt rename to cortex-9.7.0/contrib/IECoreHoudini/CMakeLists.txt diff --git a/cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindCortex.cmake b/cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindCortex.cmake similarity index 100% rename from cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindCortex.cmake rename to cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindCortex.cmake diff --git a/cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake b/cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake similarity index 100% rename from cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake rename to cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake diff --git a/cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindTBB.cmake b/cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindTBB.cmake similarity index 100% rename from cortex-9.6.0/contrib/IECoreHoudini/config/cmake/FindTBB.cmake rename to cortex-9.7.0/contrib/IECoreHoudini/config/cmake/FindTBB.cmake diff --git a/cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h b/cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h rename to cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h diff --git a/cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/Renderer.h b/cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/Renderer.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/Renderer.h rename to cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/Renderer.h diff --git a/cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h b/cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h rename to cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h diff --git a/cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h b/cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h rename to cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h diff --git a/cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h b/cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h rename to cortex-9.7.0/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf diff --git a/cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions b/cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions rename to cortex-9.7.0/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions diff --git a/cortex-9.6.0/contrib/IECoreMantra/python/IECoreMantra/__init__.py b/cortex-9.7.0/contrib/IECoreMantra/python/IECoreMantra/__init__.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/python/IECoreMantra/__init__.py rename to cortex-9.7.0/contrib/IECoreMantra/python/IECoreMantra/__init__.py diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural diff --git a/cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp b/cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp rename to cortex-9.7.0/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/All.py b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/All.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/All.py rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/All.py diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif diff --git a/cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py b/cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py similarity index 100% rename from cortex-9.6.0/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py rename to cortex-9.7.0/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py diff --git a/cortex-9.6.0/contrib/for_review/MayaOp/publishCamera-1.py b/cortex-9.7.0/contrib/for_review/MayaOp/publishCamera-1.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/MayaOp/publishCamera-1.py rename to cortex-9.7.0/contrib/for_review/MayaOp/publishCamera-1.py diff --git a/cortex-9.6.0/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py b/cortex-9.7.0/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py rename to cortex-9.7.0/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py diff --git a/cortex-9.6.0/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py b/cortex-9.7.0/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py rename to cortex-9.7.0/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py diff --git a/cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py b/cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py rename to cortex-9.7.0/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py diff --git a/cortex-9.6.0/contrib/for_review/build_configurations/osx/SConstruct.patch b/cortex-9.7.0/contrib/for_review/build_configurations/osx/SConstruct.patch similarity index 100% rename from cortex-9.6.0/contrib/for_review/build_configurations/osx/SConstruct.patch rename to cortex-9.7.0/contrib/for_review/build_configurations/osx/SConstruct.patch diff --git a/cortex-9.6.0/contrib/for_review/build_configurations/osx/options-maya2011.txt b/cortex-9.7.0/contrib/for_review/build_configurations/osx/options-maya2011.txt similarity index 100% rename from cortex-9.6.0/contrib/for_review/build_configurations/osx/options-maya2011.txt rename to cortex-9.7.0/contrib/for_review/build_configurations/osx/options-maya2011.txt diff --git a/cortex-9.6.0/contrib/for_review/build_configurations/osx/readme.txt b/cortex-9.7.0/contrib/for_review/build_configurations/osx/readme.txt similarity index 100% rename from cortex-9.6.0/contrib/for_review/build_configurations/osx/readme.txt rename to cortex-9.7.0/contrib/for_review/build_configurations/osx/readme.txt diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECore/AttributeCache.h b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECore/AttributeCache.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECore/AttributeCache.h rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECore/AttributeCache.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECore/InterpolatedCache.h b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECore/InterpolatedCache.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECore/InterpolatedCache.h rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECore/InterpolatedCache.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECoreHoudini/SOP_InterpolatedCacheReader.h b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECoreHoudini/SOP_InterpolatedCacheReader.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECoreHoudini/SOP_InterpolatedCacheReader.h rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECoreHoudini/SOP_InterpolatedCacheReader.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECorePython/AttributeCacheBinding.h b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECorePython/AttributeCacheBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECorePython/AttributeCacheBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECorePython/AttributeCacheBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECorePython/InterpolatedCacheBinding.h b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECorePython/InterpolatedCacheBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/include/IECorePython/InterpolatedCacheBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/include/IECorePython/InterpolatedCacheBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECore/AttributeCache.cpp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECore/AttributeCache.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECore/AttributeCache.cpp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECore/AttributeCache.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECore/InterpolatedCache.cpp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECore/InterpolatedCache.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECore/InterpolatedCache.cpp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECore/InterpolatedCache.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECorePython/AttributeCacheBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECorePython/AttributeCacheBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECorePython/AttributeCacheBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECorePython/AttributeCacheBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECorePython/InterpolatedCacheBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECorePython/InterpolatedCacheBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/src/IECorePython/InterpolatedCacheBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/src/IECorePython/InterpolatedCacheBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCache.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCache.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCache.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCache.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCacheAllocation.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCacheAllocation.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCacheAllocation.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/AttributeCacheAllocation.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCache.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCache.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCache.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCache.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCacheIssue.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCacheIssue.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCacheIssue.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/InterpolatedCacheIssue.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0250.fio b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0250.fio similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0250.fio rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0250.fio diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0500.fio b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0500.fio similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0500.fio rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.new.0500.fio diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1000.fio b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1000.fio similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1000.fio rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1000.fio diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1250.fio b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1250.fio similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1250.fio rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECore/data/attributeCaches/transform.old.1250.fio diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/CortexWriter.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/CortexWriter.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/CortexWriter.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/CortexWriter.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/InterpolatedCacheReader.py b/cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/InterpolatedCacheReader.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/InterpolatedCacheReader.py rename to cortex-9.7.0/contrib/removedInCortex9/attributeCache/test/IECoreHoudini/InterpolatedCacheReader.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp diff --git a/cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp b/cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp rename to cortex-9.7.0/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/CheckFileDependenciesOp.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/CheckFileDependenciesOp.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/CheckFileDependenciesOp.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/CheckFileDependenciesOp.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileDependenciesOp.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileDependenciesOp.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileDependenciesOp.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileDependenciesOp.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileExaminer.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileExaminer.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileExaminer.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/FileExaminer.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/NukeFileExaminer.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/NukeFileExaminer.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/NukeFileExaminer.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/NukeFileExaminer.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/RIBFileExaminer.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/RIBFileExaminer.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/python/IECore/RIBFileExaminer.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/python/IECore/RIBFileExaminer.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/FileExaminer.py b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/FileExaminer.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/FileExaminer.py rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/FileExaminer.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependencies.nk b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependencies.nk similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependencies.nk rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependencies.nk diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk diff --git a/cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/ribFiles/dependencies.rib b/cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/ribFiles/dependencies.rib similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/ribFiles/dependencies.rib rename to cortex-9.7.0/contrib/removedInCortex9/fileExaminers/test/IECore/data/ribFiles/dependencies.rib diff --git a/cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/include/IECore/HitMissTransform.h b/cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/include/IECore/HitMissTransform.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/include/IECore/HitMissTransform.h rename to cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/include/IECore/HitMissTransform.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/include/IECorePython/HitMissTransformBinding.h b/cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/include/IECorePython/HitMissTransformBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/include/IECorePython/HitMissTransformBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/include/IECorePython/HitMissTransformBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/src/IECore/HitMissTransform.cpp b/cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/src/IECore/HitMissTransform.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/src/IECore/HitMissTransform.cpp rename to cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/src/IECore/HitMissTransform.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/src/IECorePython/HitMissTransformBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/src/IECorePython/HitMissTransformBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/src/IECorePython/HitMissTransformBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/src/IECorePython/HitMissTransformBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/test/IECore/HitMissTransformTest.py b/cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/test/IECore/HitMissTransformTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/hitMissTransform/test/IECore/HitMissTransformTest.py rename to cortex-9.7.0/contrib/removedInCortex9/hitMissTransform/test/IECore/HitMissTransformTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py b/cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py rename to cortex-9.7.0/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.inl b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.inl rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/Marschner.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerLookupTableOp.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerLookupTableOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerLookupTableOp.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerLookupTableOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerParameter.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerParameter.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerParameter.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECore/MarschnerParameter.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerLookupTableOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerLookupTableOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerLookupTableOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerLookupTableOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerParameterBinding.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerParameterBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerParameterBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/include/IECorePython/MarschnerParameterBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.h b/cortex-9.7.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.h rename to cortex-9.7.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.inl b/cortex-9.7.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.inl rename to cortex-9.7.0/contrib/removedInCortex9/marschner/rsl/IECoreRI/Marschner.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerLookupTableOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerLookupTableOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerLookupTableOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerLookupTableOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerParameter.cpp b/cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerParameter.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerParameter.cpp rename to cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECore/MarschnerParameter.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerLookupTableOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerLookupTableOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerLookupTableOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerLookupTableOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerParameterBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerParameterBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/marschner/src/IECorePython/MarschnerParameterBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/marschner/test/IECore/MarschnerLookupTableOpTest.py b/cortex-9.7.0/contrib/removedInCortex9/marschner/test/IECore/MarschnerLookupTableOpTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/marschner/test/IECore/MarschnerLookupTableOpTest.py rename to cortex-9.7.0/contrib/removedInCortex9/marschner/test/IECore/MarschnerLookupTableOpTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/MappedRandomPointDistributionOp.h b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/MappedRandomPointDistributionOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/MappedRandomPointDistributionOp.h rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/MappedRandomPointDistributionOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/UniformRandomPointDistributionOp.h b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/UniformRandomPointDistributionOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/UniformRandomPointDistributionOp.h rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECore/UniformRandomPointDistributionOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/MappedRandomPointDistributionOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/MappedRandomPointDistributionOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/MappedRandomPointDistributionOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/MappedRandomPointDistributionOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/UniformRandomPointDistributionOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/UniformRandomPointDistributionOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/UniformRandomPointDistributionOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/include/IECorePython/UniformRandomPointDistributionOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/MappedRandomPointDistributionOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/MappedRandomPointDistributionOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/MappedRandomPointDistributionOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/MappedRandomPointDistributionOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/UniformRandomPointDistributionOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/UniformRandomPointDistributionOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/UniformRandomPointDistributionOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECore/UniformRandomPointDistributionOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/MappedRandomPointDistributionOpTest.py b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/MappedRandomPointDistributionOpTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/MappedRandomPointDistributionOpTest.py rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/MappedRandomPointDistributionOpTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/UniformRandomPointDistributionOpTest.py b/cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/UniformRandomPointDistributionOpTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/UniformRandomPointDistributionOpTest.py rename to cortex-9.7.0/contrib/removedInCortex9/pointDistributionOps/test/IECore/UniformRandomPointDistributionOpTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/simpleSubsurface/include/IECore/SimpleSubsurface.h b/cortex-9.7.0/contrib/removedInCortex9/simpleSubsurface/include/IECore/SimpleSubsurface.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/simpleSubsurface/include/IECore/SimpleSubsurface.h rename to cortex-9.7.0/contrib/removedInCortex9/simpleSubsurface/include/IECore/SimpleSubsurface.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/simpleSubsurface/src/IECore/SimpleSubsurface.cpp b/cortex-9.7.0/contrib/removedInCortex9/simpleSubsurface/src/IECore/SimpleSubsurface.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/simpleSubsurface/src/IECore/SimpleSubsurface.cpp rename to cortex-9.7.0/contrib/removedInCortex9/simpleSubsurface/src/IECore/SimpleSubsurface.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/AssociatedLegendre.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/EnvMapSHProjector.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/EnvMapSHProjector.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/EnvMapSHProjector.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/EnvMapSHProjector.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/ImageConvolveOp.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/ImageConvolveOp.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/ImageConvolveOp.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/ImageConvolveOp.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/RealSphericalHarmonicFunction.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonics.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsAlgo.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsProjector.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsRotationMatrix.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTensor.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTensor.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTensor.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTensor.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECore/SphericalHarmonicsTransferMatrix.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/EnvMapSHProjectorBinding.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/EnvMapSHProjectorBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/EnvMapSHProjectorBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/EnvMapSHProjectorBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/ImageConvolveOpBinding.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/ImageConvolveOpBinding.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/ImageConvolveOpBinding.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/include/IECorePython/ImageConvolveOpBinding.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/AssociatedLegendre.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/AssociatedLegendre.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/AssociatedLegendre.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/AssociatedLegendre.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/EnvMapSHProjector.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/EnvMapSHProjector.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/EnvMapSHProjector.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/EnvMapSHProjector.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/ImageConvolveOp.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/ImageConvolveOp.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/ImageConvolveOp.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/ImageConvolveOp.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonics.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonics.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonics.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonics.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsProjector.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsProjector.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsProjector.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsProjector.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsRotationMatrix.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsRotationMatrix.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsRotationMatrix.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsRotationMatrix.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTensor.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTensor.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTensor.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTensor.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTransferMatrix.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTransferMatrix.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTransferMatrix.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECore/SphericalHarmonicsTransferMatrix.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/EnvMapSHProjectorBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/EnvMapSHProjectorBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/EnvMapSHProjectorBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/EnvMapSHProjectorBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/ImageConvolveOpBinding.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/ImageConvolveOpBinding.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/ImageConvolveOpBinding.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/src/IECorePython/ImageConvolveOpBinding.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/ImageConvolveOpTest.py b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/ImageConvolveOpTest.py similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/ImageConvolveOpTest.py rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/ImageConvolveOpTest.py diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.cpp b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.cpp similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.cpp rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.cpp diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.h b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.h similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.h rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.h diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.inl b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.inl similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.inl rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/SphericalHarmonicsTest.inl diff --git a/cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr b/cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr similarity index 100% rename from cortex-9.6.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr rename to cortex-9.7.0/contrib/removedInCortex9/sphericalHarmonics/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr diff --git a/cortex-9.6.0/doc/config/Doxyfile b/cortex-9.7.0/doc/config/Doxyfile similarity index 100% rename from cortex-9.6.0/doc/config/Doxyfile rename to cortex-9.7.0/doc/config/Doxyfile diff --git a/cortex-9.6.0/glsl/IECoreGL/ColorAlgo.h b/cortex-9.7.0/glsl/IECoreGL/ColorAlgo.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/ColorAlgo.h rename to cortex-9.7.0/glsl/IECoreGL/ColorAlgo.h diff --git a/cortex-9.6.0/glsl/IECoreGL/CurvesPrimitive.h b/cortex-9.7.0/glsl/IECoreGL/CurvesPrimitive.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/CurvesPrimitive.h rename to cortex-9.7.0/glsl/IECoreGL/CurvesPrimitive.h diff --git a/cortex-9.6.0/glsl/IECoreGL/Diffuse.h b/cortex-9.7.0/glsl/IECoreGL/Diffuse.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/Diffuse.h rename to cortex-9.7.0/glsl/IECoreGL/Diffuse.h diff --git a/cortex-9.6.0/glsl/IECoreGL/FilterAlgo.h b/cortex-9.7.0/glsl/IECoreGL/FilterAlgo.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/FilterAlgo.h rename to cortex-9.7.0/glsl/IECoreGL/FilterAlgo.h diff --git a/cortex-9.6.0/glsl/IECoreGL/FragmentShader.h b/cortex-9.7.0/glsl/IECoreGL/FragmentShader.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/FragmentShader.h rename to cortex-9.7.0/glsl/IECoreGL/FragmentShader.h diff --git a/cortex-9.6.0/glsl/IECoreGL/Light.h b/cortex-9.7.0/glsl/IECoreGL/Light.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/Light.h rename to cortex-9.7.0/glsl/IECoreGL/Light.h diff --git a/cortex-9.6.0/glsl/IECoreGL/Lights.h b/cortex-9.7.0/glsl/IECoreGL/Lights.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/Lights.h rename to cortex-9.7.0/glsl/IECoreGL/Lights.h diff --git a/cortex-9.6.0/glsl/IECoreGL/MatrixAlgo.h b/cortex-9.7.0/glsl/IECoreGL/MatrixAlgo.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/MatrixAlgo.h rename to cortex-9.7.0/glsl/IECoreGL/MatrixAlgo.h diff --git a/cortex-9.6.0/glsl/IECoreGL/PointsPrimitive.h b/cortex-9.7.0/glsl/IECoreGL/PointsPrimitive.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/PointsPrimitive.h rename to cortex-9.7.0/glsl/IECoreGL/PointsPrimitive.h diff --git a/cortex-9.6.0/glsl/IECoreGL/Specular.h b/cortex-9.7.0/glsl/IECoreGL/Specular.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/Specular.h rename to cortex-9.7.0/glsl/IECoreGL/Specular.h diff --git a/cortex-9.6.0/glsl/IECoreGL/VecAlgo.h b/cortex-9.7.0/glsl/IECoreGL/VecAlgo.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/VecAlgo.h rename to cortex-9.7.0/glsl/IECoreGL/VecAlgo.h diff --git a/cortex-9.6.0/glsl/IECoreGL/VertexShader.h b/cortex-9.7.0/glsl/IECoreGL/VertexShader.h similarity index 100% rename from cortex-9.6.0/glsl/IECoreGL/VertexShader.h rename to cortex-9.7.0/glsl/IECoreGL/VertexShader.h diff --git a/cortex-9.6.0/glsl/ieConstant.frag b/cortex-9.7.0/glsl/ieConstant.frag similarity index 100% rename from cortex-9.6.0/glsl/ieConstant.frag rename to cortex-9.7.0/glsl/ieConstant.frag diff --git a/cortex-9.6.0/glsl/ieConstant.vert b/cortex-9.7.0/glsl/ieConstant.vert similarity index 100% rename from cortex-9.6.0/glsl/ieConstant.vert rename to cortex-9.7.0/glsl/ieConstant.vert diff --git a/cortex-9.6.0/glsl/ieMarschnerHair.frag b/cortex-9.7.0/glsl/ieMarschnerHair.frag similarity index 100% rename from cortex-9.6.0/glsl/ieMarschnerHair.frag rename to cortex-9.7.0/glsl/ieMarschnerHair.frag diff --git a/cortex-9.6.0/glsl/ieMarschnerHair.vert b/cortex-9.7.0/glsl/ieMarschnerHair.vert similarity index 100% rename from cortex-9.6.0/glsl/ieMarschnerHair.vert rename to cortex-9.7.0/glsl/ieMarschnerHair.vert diff --git a/cortex-9.6.0/graphics/CortexLogo.svg b/cortex-9.7.0/graphics/CortexLogo.svg similarity index 100% rename from cortex-9.6.0/graphics/CortexLogo.svg rename to cortex-9.7.0/graphics/CortexLogo.svg diff --git a/cortex-9.6.0/graphics/CortexLogoMini.svg b/cortex-9.7.0/graphics/CortexLogoMini.svg similarity index 100% rename from cortex-9.6.0/graphics/CortexLogoMini.svg rename to cortex-9.7.0/graphics/CortexLogoMini.svg diff --git a/cortex-9.6.0/graphics/icons.svg b/cortex-9.7.0/graphics/icons.svg similarity index 100% rename from cortex-9.6.0/graphics/icons.svg rename to cortex-9.7.0/graphics/icons.svg diff --git a/cortex-9.6.0/icons/IECoreHoudini/SOP_ieCortexConverter.svg b/cortex-9.7.0/icons/IECoreHoudini/SOP_ieCortexConverter.svg similarity index 100% rename from cortex-9.6.0/icons/IECoreHoudini/SOP_ieCortexConverter.svg rename to cortex-9.7.0/icons/IECoreHoudini/SOP_ieCortexConverter.svg diff --git a/cortex-9.6.0/icons/IECoreHoudini/SOP_ieInterpolatedCacheReader.svg b/cortex-9.7.0/icons/IECoreHoudini/SOP_ieInterpolatedCacheReader.svg similarity index 100% rename from cortex-9.6.0/icons/IECoreHoudini/SOP_ieInterpolatedCacheReader.svg rename to cortex-9.7.0/icons/IECoreHoudini/SOP_ieInterpolatedCacheReader.svg diff --git a/cortex-9.6.0/icons/IECoreHoudini/SOP_ieOpHolder.svg b/cortex-9.7.0/icons/IECoreHoudini/SOP_ieOpHolder.svg similarity index 100% rename from cortex-9.6.0/icons/IECoreHoudini/SOP_ieOpHolder.svg rename to cortex-9.7.0/icons/IECoreHoudini/SOP_ieOpHolder.svg diff --git a/cortex-9.6.0/icons/IECoreHoudini/SOP_ieProceduralHolder.svg b/cortex-9.7.0/icons/IECoreHoudini/SOP_ieProceduralHolder.svg similarity index 100% rename from cortex-9.6.0/icons/IECoreHoudini/SOP_ieProceduralHolder.svg rename to cortex-9.7.0/icons/IECoreHoudini/SOP_ieProceduralHolder.svg diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_actionIcon.png b/cortex-9.7.0/icons/IECoreMaya/ie_actionIcon.png similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_actionIcon.png rename to cortex-9.7.0/icons/IECoreMaya/ie_actionIcon.png diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_actionIcon.xpm b/cortex-9.7.0/icons/IECoreMaya/ie_actionIcon.xpm similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_actionIcon.xpm rename to cortex-9.7.0/icons/IECoreMaya/ie_actionIcon.xpm diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_actionIcon_grey.png b/cortex-9.7.0/icons/IECoreMaya/ie_actionIcon_grey.png similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_actionIcon_grey.png rename to cortex-9.7.0/icons/IECoreMaya/ie_actionIcon_grey.png diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_actionIcon_grey.xpm b/cortex-9.7.0/icons/IECoreMaya/ie_actionIcon_grey.xpm similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_actionIcon_grey.xpm rename to cortex-9.7.0/icons/IECoreMaya/ie_actionIcon_grey.xpm diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_addIcon.png b/cortex-9.7.0/icons/IECoreMaya/ie_addIcon.png similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_addIcon.png rename to cortex-9.7.0/icons/IECoreMaya/ie_addIcon.png diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_addIcon.xpm b/cortex-9.7.0/icons/IECoreMaya/ie_addIcon.xpm similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_addIcon.xpm rename to cortex-9.7.0/icons/IECoreMaya/ie_addIcon.xpm diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_addIcon_grey.png b/cortex-9.7.0/icons/IECoreMaya/ie_addIcon_grey.png similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_addIcon_grey.png rename to cortex-9.7.0/icons/IECoreMaya/ie_addIcon_grey.png diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_addIcon_grey.xpm b/cortex-9.7.0/icons/IECoreMaya/ie_addIcon_grey.xpm similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_addIcon_grey.xpm rename to cortex-9.7.0/icons/IECoreMaya/ie_addIcon_grey.xpm diff --git a/cortex-9.6.0/icons/IECoreMaya/ie_editTextIcon.xpm b/cortex-9.7.0/icons/IECoreMaya/ie_editTextIcon.xpm similarity index 100% rename from cortex-9.6.0/icons/IECoreMaya/ie_editTextIcon.xpm rename to cortex-9.7.0/icons/IECoreMaya/ie_editTextIcon.xpm diff --git a/cortex-9.6.0/include/IECore/AddSmoothSkinningInfluencesOp.h b/cortex-9.7.0/include/IECore/AddSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/AddSmoothSkinningInfluencesOp.h rename to cortex-9.7.0/include/IECore/AddSmoothSkinningInfluencesOp.h diff --git a/cortex-9.6.0/include/IECore/AlexaLogcToLinearDataConversion.h b/cortex-9.7.0/include/IECore/AlexaLogcToLinearDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/AlexaLogcToLinearDataConversion.h rename to cortex-9.7.0/include/IECore/AlexaLogcToLinearDataConversion.h diff --git a/cortex-9.6.0/include/IECore/AlexaLogcToLinearDataConversion.inl b/cortex-9.7.0/include/IECore/AlexaLogcToLinearDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/AlexaLogcToLinearDataConversion.inl rename to cortex-9.7.0/include/IECore/AlexaLogcToLinearDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/AlexaLogcToLinearOp.h b/cortex-9.7.0/include/IECore/AlexaLogcToLinearOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/AlexaLogcToLinearOp.h rename to cortex-9.7.0/include/IECore/AlexaLogcToLinearOp.h diff --git a/cortex-9.6.0/include/IECore/AngleConversion.h b/cortex-9.7.0/include/IECore/AngleConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/AngleConversion.h rename to cortex-9.7.0/include/IECore/AngleConversion.h diff --git a/cortex-9.6.0/include/IECore/AttributeBlock.h b/cortex-9.7.0/include/IECore/AttributeBlock.h similarity index 100% rename from cortex-9.6.0/include/IECore/AttributeBlock.h rename to cortex-9.7.0/include/IECore/AttributeBlock.h diff --git a/cortex-9.6.0/include/IECore/AttributeState.h b/cortex-9.7.0/include/IECore/AttributeState.h similarity index 100% rename from cortex-9.6.0/include/IECore/AttributeState.h rename to cortex-9.7.0/include/IECore/AttributeState.h diff --git a/cortex-9.6.0/include/IECore/BezierAlgo.h b/cortex-9.7.0/include/IECore/BezierAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/BezierAlgo.h rename to cortex-9.7.0/include/IECore/BezierAlgo.h diff --git a/cortex-9.6.0/include/IECore/BezierAlgo.inl b/cortex-9.7.0/include/IECore/BezierAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/BezierAlgo.inl rename to cortex-9.7.0/include/IECore/BezierAlgo.inl diff --git a/cortex-9.6.0/include/IECore/BinaryFrameList.h b/cortex-9.7.0/include/IECore/BinaryFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/BinaryFrameList.h rename to cortex-9.7.0/include/IECore/BinaryFrameList.h diff --git a/cortex-9.6.0/include/IECore/BlindDataHolder.h b/cortex-9.7.0/include/IECore/BlindDataHolder.h similarity index 100% rename from cortex-9.6.0/include/IECore/BlindDataHolder.h rename to cortex-9.7.0/include/IECore/BlindDataHolder.h diff --git a/cortex-9.6.0/include/IECore/BoundedKDTree.h b/cortex-9.7.0/include/IECore/BoundedKDTree.h similarity index 100% rename from cortex-9.6.0/include/IECore/BoundedKDTree.h rename to cortex-9.7.0/include/IECore/BoundedKDTree.h diff --git a/cortex-9.6.0/include/IECore/BoundedKDTree.inl b/cortex-9.7.0/include/IECore/BoundedKDTree.inl similarity index 100% rename from cortex-9.6.0/include/IECore/BoundedKDTree.inl rename to cortex-9.7.0/include/IECore/BoundedKDTree.inl diff --git a/cortex-9.6.0/include/IECore/BoxAlgo.h b/cortex-9.7.0/include/IECore/BoxAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/BoxAlgo.h rename to cortex-9.7.0/include/IECore/BoxAlgo.h diff --git a/cortex-9.6.0/include/IECore/BoxAlgo.inl b/cortex-9.7.0/include/IECore/BoxAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/BoxAlgo.inl rename to cortex-9.7.0/include/IECore/BoxAlgo.inl diff --git a/cortex-9.6.0/include/IECore/BoxInterpolator.inl b/cortex-9.7.0/include/IECore/BoxInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/BoxInterpolator.inl rename to cortex-9.7.0/include/IECore/BoxInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/BoxOps.h b/cortex-9.7.0/include/IECore/BoxOps.h similarity index 100% rename from cortex-9.6.0/include/IECore/BoxOps.h rename to cortex-9.7.0/include/IECore/BoxOps.h diff --git a/cortex-9.6.0/include/IECore/BoxOps.inl b/cortex-9.7.0/include/IECore/BoxOps.inl similarity index 100% rename from cortex-9.6.0/include/IECore/BoxOps.inl rename to cortex-9.7.0/include/IECore/BoxOps.inl diff --git a/cortex-9.6.0/include/IECore/BoxTraits.h b/cortex-9.7.0/include/IECore/BoxTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/BoxTraits.h rename to cortex-9.7.0/include/IECore/BoxTraits.h diff --git a/cortex-9.6.0/include/IECore/ByteOrder.h b/cortex-9.7.0/include/IECore/ByteOrder.h similarity index 100% rename from cortex-9.6.0/include/IECore/ByteOrder.h rename to cortex-9.7.0/include/IECore/ByteOrder.h diff --git a/cortex-9.6.0/include/IECore/CINImageReader.h b/cortex-9.7.0/include/IECore/CINImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/CINImageReader.h rename to cortex-9.7.0/include/IECore/CINImageReader.h diff --git a/cortex-9.6.0/include/IECore/CINImageWriter.h b/cortex-9.7.0/include/IECore/CINImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/CINImageWriter.h rename to cortex-9.7.0/include/IECore/CINImageWriter.h diff --git a/cortex-9.6.0/include/IECore/CachedReader.h b/cortex-9.7.0/include/IECore/CachedReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/CachedReader.h rename to cortex-9.7.0/include/IECore/CachedReader.h diff --git a/cortex-9.6.0/include/IECore/CamelCase.h b/cortex-9.7.0/include/IECore/CamelCase.h similarity index 100% rename from cortex-9.6.0/include/IECore/CamelCase.h rename to cortex-9.7.0/include/IECore/CamelCase.h diff --git a/cortex-9.6.0/include/IECore/CamelCase.inl b/cortex-9.7.0/include/IECore/CamelCase.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CamelCase.inl rename to cortex-9.7.0/include/IECore/CamelCase.inl diff --git a/cortex-9.6.0/include/IECore/Camera.h b/cortex-9.7.0/include/IECore/Camera.h similarity index 100% rename from cortex-9.6.0/include/IECore/Camera.h rename to cortex-9.7.0/include/IECore/Camera.h diff --git a/cortex-9.6.0/include/IECore/CameraController.h b/cortex-9.7.0/include/IECore/CameraController.h similarity index 100% rename from cortex-9.6.0/include/IECore/CameraController.h rename to cortex-9.7.0/include/IECore/CameraController.h diff --git a/cortex-9.6.0/include/IECore/CapturingRenderer.h b/cortex-9.7.0/include/IECore/CapturingRenderer.h similarity index 100% rename from cortex-9.6.0/include/IECore/CapturingRenderer.h rename to cortex-9.7.0/include/IECore/CapturingRenderer.h diff --git a/cortex-9.6.0/include/IECore/ChannelOp.h b/cortex-9.7.0/include/IECore/ChannelOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ChannelOp.h rename to cortex-9.7.0/include/IECore/ChannelOp.h diff --git a/cortex-9.6.0/include/IECore/CineonToLinearDataConversion.h b/cortex-9.7.0/include/IECore/CineonToLinearDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/CineonToLinearDataConversion.h rename to cortex-9.7.0/include/IECore/CineonToLinearDataConversion.h diff --git a/cortex-9.6.0/include/IECore/CineonToLinearDataConversion.inl b/cortex-9.7.0/include/IECore/CineonToLinearDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CineonToLinearDataConversion.inl rename to cortex-9.7.0/include/IECore/CineonToLinearDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/CineonToLinearOp.h b/cortex-9.7.0/include/IECore/CineonToLinearOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CineonToLinearOp.h rename to cortex-9.7.0/include/IECore/CineonToLinearOp.h diff --git a/cortex-9.6.0/include/IECore/CircularIterator.h b/cortex-9.7.0/include/IECore/CircularIterator.h similarity index 100% rename from cortex-9.6.0/include/IECore/CircularIterator.h rename to cortex-9.7.0/include/IECore/CircularIterator.h diff --git a/cortex-9.6.0/include/IECore/CircularIterator.inl b/cortex-9.7.0/include/IECore/CircularIterator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CircularIterator.inl rename to cortex-9.7.0/include/IECore/CircularIterator.inl diff --git a/cortex-9.6.0/include/IECore/ClampOp.h b/cortex-9.7.0/include/IECore/ClampOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ClampOp.h rename to cortex-9.7.0/include/IECore/ClampOp.h diff --git a/cortex-9.6.0/include/IECore/ClassData.h b/cortex-9.7.0/include/IECore/ClassData.h similarity index 100% rename from cortex-9.6.0/include/IECore/ClassData.h rename to cortex-9.7.0/include/IECore/ClassData.h diff --git a/cortex-9.6.0/include/IECore/ClassData.inl b/cortex-9.7.0/include/IECore/ClassData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ClassData.inl rename to cortex-9.7.0/include/IECore/ClassData.inl diff --git a/cortex-9.6.0/include/IECore/ClientDisplayDriver.h b/cortex-9.7.0/include/IECore/ClientDisplayDriver.h similarity index 100% rename from cortex-9.6.0/include/IECore/ClientDisplayDriver.h rename to cortex-9.7.0/include/IECore/ClientDisplayDriver.h diff --git a/cortex-9.6.0/include/IECore/ClippingPlane.h b/cortex-9.7.0/include/IECore/ClippingPlane.h similarity index 100% rename from cortex-9.6.0/include/IECore/ClippingPlane.h rename to cortex-9.7.0/include/IECore/ClippingPlane.h diff --git a/cortex-9.6.0/include/IECore/ColorAlgo.h b/cortex-9.7.0/include/IECore/ColorAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/ColorAlgo.h rename to cortex-9.7.0/include/IECore/ColorAlgo.h diff --git a/cortex-9.6.0/include/IECore/ColorAlgo.inl b/cortex-9.7.0/include/IECore/ColorAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ColorAlgo.inl rename to cortex-9.7.0/include/IECore/ColorAlgo.inl diff --git a/cortex-9.6.0/include/IECore/ColorSpaceTransformOp.h b/cortex-9.7.0/include/IECore/ColorSpaceTransformOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ColorSpaceTransformOp.h rename to cortex-9.7.0/include/IECore/ColorSpaceTransformOp.h diff --git a/cortex-9.6.0/include/IECore/ColorSpaceTransformOp.inl b/cortex-9.7.0/include/IECore/ColorSpaceTransformOp.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ColorSpaceTransformOp.inl rename to cortex-9.7.0/include/IECore/ColorSpaceTransformOp.inl diff --git a/cortex-9.6.0/include/IECore/ColorTransform.h b/cortex-9.7.0/include/IECore/ColorTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/ColorTransform.h rename to cortex-9.7.0/include/IECore/ColorTransform.h diff --git a/cortex-9.6.0/include/IECore/ColorTransformOp.h b/cortex-9.7.0/include/IECore/ColorTransformOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ColorTransformOp.h rename to cortex-9.7.0/include/IECore/ColorTransformOp.h diff --git a/cortex-9.6.0/include/IECore/CompositeAlgo.h b/cortex-9.7.0/include/IECore/CompositeAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompositeAlgo.h rename to cortex-9.7.0/include/IECore/CompositeAlgo.h diff --git a/cortex-9.6.0/include/IECore/CompositeAlgo.inl b/cortex-9.7.0/include/IECore/CompositeAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CompositeAlgo.inl rename to cortex-9.7.0/include/IECore/CompositeAlgo.inl diff --git a/cortex-9.6.0/include/IECore/CompoundData.h b/cortex-9.7.0/include/IECore/CompoundData.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundData.h rename to cortex-9.7.0/include/IECore/CompoundData.h diff --git a/cortex-9.6.0/include/IECore/CompoundData.inl b/cortex-9.7.0/include/IECore/CompoundData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundData.inl rename to cortex-9.7.0/include/IECore/CompoundData.inl diff --git a/cortex-9.6.0/include/IECore/CompoundDataBase.h b/cortex-9.7.0/include/IECore/CompoundDataBase.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundDataBase.h rename to cortex-9.7.0/include/IECore/CompoundDataBase.h diff --git a/cortex-9.6.0/include/IECore/CompoundDataConversion.h b/cortex-9.7.0/include/IECore/CompoundDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundDataConversion.h rename to cortex-9.7.0/include/IECore/CompoundDataConversion.h diff --git a/cortex-9.6.0/include/IECore/CompoundDataConversion.inl b/cortex-9.7.0/include/IECore/CompoundDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundDataConversion.inl rename to cortex-9.7.0/include/IECore/CompoundDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/CompoundFrameList.h b/cortex-9.7.0/include/IECore/CompoundFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundFrameList.h rename to cortex-9.7.0/include/IECore/CompoundFrameList.h diff --git a/cortex-9.6.0/include/IECore/CompoundMessageHandler.h b/cortex-9.7.0/include/IECore/CompoundMessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundMessageHandler.h rename to cortex-9.7.0/include/IECore/CompoundMessageHandler.h diff --git a/cortex-9.6.0/include/IECore/CompoundObject.h b/cortex-9.7.0/include/IECore/CompoundObject.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundObject.h rename to cortex-9.7.0/include/IECore/CompoundObject.h diff --git a/cortex-9.6.0/include/IECore/CompoundObject.inl b/cortex-9.7.0/include/IECore/CompoundObject.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundObject.inl rename to cortex-9.7.0/include/IECore/CompoundObject.inl diff --git a/cortex-9.6.0/include/IECore/CompoundParameter.h b/cortex-9.7.0/include/IECore/CompoundParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundParameter.h rename to cortex-9.7.0/include/IECore/CompoundParameter.h diff --git a/cortex-9.6.0/include/IECore/CompoundParameter.inl b/cortex-9.7.0/include/IECore/CompoundParameter.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CompoundParameter.inl rename to cortex-9.7.0/include/IECore/CompoundParameter.inl diff --git a/cortex-9.6.0/include/IECore/CompressSmoothSkinningDataOp.h b/cortex-9.7.0/include/IECore/CompressSmoothSkinningDataOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CompressSmoothSkinningDataOp.h rename to cortex-9.7.0/include/IECore/CompressSmoothSkinningDataOp.h diff --git a/cortex-9.6.0/include/IECore/ComputationCache.h b/cortex-9.7.0/include/IECore/ComputationCache.h similarity index 100% rename from cortex-9.6.0/include/IECore/ComputationCache.h rename to cortex-9.7.0/include/IECore/ComputationCache.h diff --git a/cortex-9.6.0/include/IECore/ComputationCache.inl b/cortex-9.7.0/include/IECore/ComputationCache.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ComputationCache.inl rename to cortex-9.7.0/include/IECore/ComputationCache.inl diff --git a/cortex-9.6.0/include/IECore/ContrastSmoothSkinningWeightsOp.h b/cortex-9.7.0/include/IECore/ContrastSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ContrastSmoothSkinningWeightsOp.h rename to cortex-9.7.0/include/IECore/ContrastSmoothSkinningWeightsOp.h diff --git a/cortex-9.6.0/include/IECore/Convert.h b/cortex-9.7.0/include/IECore/Convert.h similarity index 100% rename from cortex-9.6.0/include/IECore/Convert.h rename to cortex-9.7.0/include/IECore/Convert.h diff --git a/cortex-9.6.0/include/IECore/Converter.h b/cortex-9.7.0/include/IECore/Converter.h similarity index 100% rename from cortex-9.6.0/include/IECore/Converter.h rename to cortex-9.7.0/include/IECore/Converter.h diff --git a/cortex-9.6.0/include/IECore/CoordinateSystem.h b/cortex-9.7.0/include/IECore/CoordinateSystem.h similarity index 100% rename from cortex-9.6.0/include/IECore/CoordinateSystem.h rename to cortex-9.7.0/include/IECore/CoordinateSystem.h diff --git a/cortex-9.6.0/include/IECore/CubeColorLookup.h b/cortex-9.7.0/include/IECore/CubeColorLookup.h similarity index 100% rename from cortex-9.6.0/include/IECore/CubeColorLookup.h rename to cortex-9.7.0/include/IECore/CubeColorLookup.h diff --git a/cortex-9.6.0/include/IECore/CubeColorLookup.inl b/cortex-9.7.0/include/IECore/CubeColorLookup.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CubeColorLookup.inl rename to cortex-9.7.0/include/IECore/CubeColorLookup.inl diff --git a/cortex-9.6.0/include/IECore/CubeColorLookupData.h b/cortex-9.7.0/include/IECore/CubeColorLookupData.h similarity index 100% rename from cortex-9.6.0/include/IECore/CubeColorLookupData.h rename to cortex-9.7.0/include/IECore/CubeColorLookupData.h diff --git a/cortex-9.6.0/include/IECore/CubeColorLookupParameter.h b/cortex-9.7.0/include/IECore/CubeColorLookupParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/CubeColorLookupParameter.h rename to cortex-9.7.0/include/IECore/CubeColorLookupParameter.h diff --git a/cortex-9.6.0/include/IECore/CubeColorTransformOp.h b/cortex-9.7.0/include/IECore/CubeColorTransformOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CubeColorTransformOp.h rename to cortex-9.7.0/include/IECore/CubeColorTransformOp.h diff --git a/cortex-9.6.0/include/IECore/CubicBasis.h b/cortex-9.7.0/include/IECore/CubicBasis.h similarity index 100% rename from cortex-9.6.0/include/IECore/CubicBasis.h rename to cortex-9.7.0/include/IECore/CubicBasis.h diff --git a/cortex-9.6.0/include/IECore/CubicBasis.inl b/cortex-9.7.0/include/IECore/CubicBasis.inl similarity index 100% rename from cortex-9.6.0/include/IECore/CubicBasis.inl rename to cortex-9.7.0/include/IECore/CubicBasis.inl diff --git a/cortex-9.6.0/include/IECore/CurveExtrudeOp.h b/cortex-9.7.0/include/IECore/CurveExtrudeOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurveExtrudeOp.h rename to cortex-9.7.0/include/IECore/CurveExtrudeOp.h diff --git a/cortex-9.6.0/include/IECore/CurveLineariser.h b/cortex-9.7.0/include/IECore/CurveLineariser.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurveLineariser.h rename to cortex-9.7.0/include/IECore/CurveLineariser.h diff --git a/cortex-9.6.0/include/IECore/CurveTangentsOp.h b/cortex-9.7.0/include/IECore/CurveTangentsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurveTangentsOp.h rename to cortex-9.7.0/include/IECore/CurveTangentsOp.h diff --git a/cortex-9.6.0/include/IECore/CurveTracer.h b/cortex-9.7.0/include/IECore/CurveTracer.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurveTracer.h rename to cortex-9.7.0/include/IECore/CurveTracer.h diff --git a/cortex-9.6.0/include/IECore/CurvesMergeOp.h b/cortex-9.7.0/include/IECore/CurvesMergeOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurvesMergeOp.h rename to cortex-9.7.0/include/IECore/CurvesMergeOp.h diff --git a/cortex-9.6.0/include/IECore/CurvesPrimitive.h b/cortex-9.7.0/include/IECore/CurvesPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurvesPrimitive.h rename to cortex-9.7.0/include/IECore/CurvesPrimitive.h diff --git a/cortex-9.6.0/include/IECore/CurvesPrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/CurvesPrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/CurvesPrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/CurvesPrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/DPXImageReader.h b/cortex-9.7.0/include/IECore/DPXImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/DPXImageReader.h rename to cortex-9.7.0/include/IECore/DPXImageReader.h diff --git a/cortex-9.6.0/include/IECore/DPXImageWriter.h b/cortex-9.7.0/include/IECore/DPXImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/DPXImageWriter.h rename to cortex-9.7.0/include/IECore/DPXImageWriter.h diff --git a/cortex-9.6.0/include/IECore/Data.h b/cortex-9.7.0/include/IECore/Data.h similarity index 100% rename from cortex-9.6.0/include/IECore/Data.h rename to cortex-9.7.0/include/IECore/Data.h diff --git a/cortex-9.6.0/include/IECore/DataAlgo.h b/cortex-9.7.0/include/IECore/DataAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataAlgo.h rename to cortex-9.7.0/include/IECore/DataAlgo.h diff --git a/cortex-9.6.0/include/IECore/DataCastOp.h b/cortex-9.7.0/include/IECore/DataCastOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataCastOp.h rename to cortex-9.7.0/include/IECore/DataCastOp.h diff --git a/cortex-9.6.0/include/IECore/DataConversion.h b/cortex-9.7.0/include/IECore/DataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataConversion.h rename to cortex-9.7.0/include/IECore/DataConversion.h diff --git a/cortex-9.6.0/include/IECore/DataConvert.h b/cortex-9.7.0/include/IECore/DataConvert.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataConvert.h rename to cortex-9.7.0/include/IECore/DataConvert.h diff --git a/cortex-9.6.0/include/IECore/DataConvert.inl b/cortex-9.7.0/include/IECore/DataConvert.inl similarity index 100% rename from cortex-9.6.0/include/IECore/DataConvert.inl rename to cortex-9.7.0/include/IECore/DataConvert.inl diff --git a/cortex-9.6.0/include/IECore/DataConvertOp.h b/cortex-9.7.0/include/IECore/DataConvertOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataConvertOp.h rename to cortex-9.7.0/include/IECore/DataConvertOp.h diff --git a/cortex-9.6.0/include/IECore/DataInterleaveOp.h b/cortex-9.7.0/include/IECore/DataInterleaveOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataInterleaveOp.h rename to cortex-9.7.0/include/IECore/DataInterleaveOp.h diff --git a/cortex-9.6.0/include/IECore/DataPromoteOp.h b/cortex-9.7.0/include/IECore/DataPromoteOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/DataPromoteOp.h rename to cortex-9.7.0/include/IECore/DataPromoteOp.h diff --git a/cortex-9.6.0/include/IECore/DateTimeData.h b/cortex-9.7.0/include/IECore/DateTimeData.h similarity index 100% rename from cortex-9.6.0/include/IECore/DateTimeData.h rename to cortex-9.7.0/include/IECore/DateTimeData.h diff --git a/cortex-9.6.0/include/IECore/DateTimeParameter.h b/cortex-9.7.0/include/IECore/DateTimeParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/DateTimeParameter.h rename to cortex-9.7.0/include/IECore/DateTimeParameter.h diff --git a/cortex-9.6.0/include/IECore/DecompressSmoothSkinningDataOp.h b/cortex-9.7.0/include/IECore/DecompressSmoothSkinningDataOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/DecompressSmoothSkinningDataOp.h rename to cortex-9.7.0/include/IECore/DecompressSmoothSkinningDataOp.h diff --git a/cortex-9.6.0/include/IECore/DeepImageConverter.h b/cortex-9.7.0/include/IECore/DeepImageConverter.h similarity index 100% rename from cortex-9.6.0/include/IECore/DeepImageConverter.h rename to cortex-9.7.0/include/IECore/DeepImageConverter.h diff --git a/cortex-9.6.0/include/IECore/DeepImageReader.h b/cortex-9.7.0/include/IECore/DeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/DeepImageReader.h rename to cortex-9.7.0/include/IECore/DeepImageReader.h diff --git a/cortex-9.6.0/include/IECore/DeepImageWriter.h b/cortex-9.7.0/include/IECore/DeepImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/DeepImageWriter.h rename to cortex-9.7.0/include/IECore/DeepImageWriter.h diff --git a/cortex-9.6.0/include/IECore/DeepImageWriter.inl b/cortex-9.7.0/include/IECore/DeepImageWriter.inl similarity index 100% rename from cortex-9.6.0/include/IECore/DeepImageWriter.inl rename to cortex-9.7.0/include/IECore/DeepImageWriter.inl diff --git a/cortex-9.6.0/include/IECore/DeepPixel.h b/cortex-9.7.0/include/IECore/DeepPixel.h similarity index 100% rename from cortex-9.6.0/include/IECore/DeepPixel.h rename to cortex-9.7.0/include/IECore/DeepPixel.h diff --git a/cortex-9.6.0/include/IECore/Deleter.h b/cortex-9.7.0/include/IECore/Deleter.h similarity index 100% rename from cortex-9.6.0/include/IECore/Deleter.h rename to cortex-9.7.0/include/IECore/Deleter.h diff --git a/cortex-9.6.0/include/IECore/DespatchTypedData.h b/cortex-9.7.0/include/IECore/DespatchTypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/DespatchTypedData.h rename to cortex-9.7.0/include/IECore/DespatchTypedData.h diff --git a/cortex-9.6.0/include/IECore/DespatchTypedData.inl b/cortex-9.7.0/include/IECore/DespatchTypedData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/DespatchTypedData.inl rename to cortex-9.7.0/include/IECore/DespatchTypedData.inl diff --git a/cortex-9.6.0/include/IECore/DimensionTraits.h b/cortex-9.7.0/include/IECore/DimensionTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/DimensionTraits.h rename to cortex-9.7.0/include/IECore/DimensionTraits.h diff --git a/cortex-9.6.0/include/IECore/DimensionTraits.inl b/cortex-9.7.0/include/IECore/DimensionTraits.inl similarity index 100% rename from cortex-9.6.0/include/IECore/DimensionTraits.inl rename to cortex-9.7.0/include/IECore/DimensionTraits.inl diff --git a/cortex-9.6.0/include/IECore/DirNameParameter.h b/cortex-9.7.0/include/IECore/DirNameParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/DirNameParameter.h rename to cortex-9.7.0/include/IECore/DirNameParameter.h diff --git a/cortex-9.6.0/include/IECore/DiskPrimitive.h b/cortex-9.7.0/include/IECore/DiskPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/DiskPrimitive.h rename to cortex-9.7.0/include/IECore/DiskPrimitive.h diff --git a/cortex-9.6.0/include/IECore/Display.h b/cortex-9.7.0/include/IECore/Display.h similarity index 100% rename from cortex-9.6.0/include/IECore/Display.h rename to cortex-9.7.0/include/IECore/Display.h diff --git a/cortex-9.6.0/include/IECore/DisplayDriver.h b/cortex-9.7.0/include/IECore/DisplayDriver.h similarity index 100% rename from cortex-9.6.0/include/IECore/DisplayDriver.h rename to cortex-9.7.0/include/IECore/DisplayDriver.h diff --git a/cortex-9.6.0/include/IECore/DisplayDriver.inl b/cortex-9.7.0/include/IECore/DisplayDriver.inl similarity index 100% rename from cortex-9.6.0/include/IECore/DisplayDriver.inl rename to cortex-9.7.0/include/IECore/DisplayDriver.inl diff --git a/cortex-9.6.0/include/IECore/DisplayDriverServer.h b/cortex-9.7.0/include/IECore/DisplayDriverServer.h similarity index 100% rename from cortex-9.6.0/include/IECore/DisplayDriverServer.h rename to cortex-9.7.0/include/IECore/DisplayDriverServer.h diff --git a/cortex-9.6.0/include/IECore/EXRDeepImageReader.h b/cortex-9.7.0/include/IECore/EXRDeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/EXRDeepImageReader.h rename to cortex-9.7.0/include/IECore/EXRDeepImageReader.h diff --git a/cortex-9.6.0/include/IECore/EXRDeepImageWriter.h b/cortex-9.7.0/include/IECore/EXRDeepImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/EXRDeepImageWriter.h rename to cortex-9.7.0/include/IECore/EXRDeepImageWriter.h diff --git a/cortex-9.6.0/include/IECore/EXRImageReader.h b/cortex-9.7.0/include/IECore/EXRImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/EXRImageReader.h rename to cortex-9.7.0/include/IECore/EXRImageReader.h diff --git a/cortex-9.6.0/include/IECore/EXRImageWriter.h b/cortex-9.7.0/include/IECore/EXRImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/EXRImageWriter.h rename to cortex-9.7.0/include/IECore/EXRImageWriter.h diff --git a/cortex-9.6.0/include/IECore/EditBlock.h b/cortex-9.7.0/include/IECore/EditBlock.h similarity index 100% rename from cortex-9.6.0/include/IECore/EditBlock.h rename to cortex-9.7.0/include/IECore/EditBlock.h diff --git a/cortex-9.6.0/include/IECore/EmptyFrameList.h b/cortex-9.7.0/include/IECore/EmptyFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/EmptyFrameList.h rename to cortex-9.7.0/include/IECore/EmptyFrameList.h diff --git a/cortex-9.6.0/include/IECore/EnvMapSampler.h b/cortex-9.7.0/include/IECore/EnvMapSampler.h similarity index 100% rename from cortex-9.6.0/include/IECore/EnvMapSampler.h rename to cortex-9.7.0/include/IECore/EnvMapSampler.h diff --git a/cortex-9.6.0/include/IECore/EuclideanToSphericalTransform.h b/cortex-9.7.0/include/IECore/EuclideanToSphericalTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/EuclideanToSphericalTransform.h rename to cortex-9.7.0/include/IECore/EuclideanToSphericalTransform.h diff --git a/cortex-9.6.0/include/IECore/EuclideanToSphericalTransform.inl b/cortex-9.7.0/include/IECore/EuclideanToSphericalTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/EuclideanToSphericalTransform.inl rename to cortex-9.7.0/include/IECore/EuclideanToSphericalTransform.inl diff --git a/cortex-9.6.0/include/IECore/Exception.h b/cortex-9.7.0/include/IECore/Exception.h similarity index 100% rename from cortex-9.6.0/include/IECore/Exception.h rename to cortex-9.7.0/include/IECore/Exception.h diff --git a/cortex-9.6.0/include/IECore/ExclusionFrameList.h b/cortex-9.7.0/include/IECore/ExclusionFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/ExclusionFrameList.h rename to cortex-9.7.0/include/IECore/ExclusionFrameList.h diff --git a/cortex-9.6.0/include/IECore/Export.h b/cortex-9.7.0/include/IECore/Export.h similarity index 100% rename from cortex-9.6.0/include/IECore/Export.h rename to cortex-9.7.0/include/IECore/Export.h diff --git a/cortex-9.6.0/include/IECore/ExternalProcedural.h b/cortex-9.7.0/include/IECore/ExternalProcedural.h similarity index 100% rename from cortex-9.6.0/include/IECore/ExternalProcedural.h rename to cortex-9.7.0/include/IECore/ExternalProcedural.h diff --git a/cortex-9.6.0/include/IECore/FaceAreaOp.h b/cortex-9.7.0/include/IECore/FaceAreaOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/FaceAreaOp.h rename to cortex-9.7.0/include/IECore/FaceAreaOp.h diff --git a/cortex-9.6.0/include/IECore/FaceVaryingPromotionOp.h b/cortex-9.7.0/include/IECore/FaceVaryingPromotionOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/FaceVaryingPromotionOp.h rename to cortex-9.7.0/include/IECore/FaceVaryingPromotionOp.h diff --git a/cortex-9.6.0/include/IECore/FastFloat.h b/cortex-9.7.0/include/IECore/FastFloat.h similarity index 100% rename from cortex-9.6.0/include/IECore/FastFloat.h rename to cortex-9.7.0/include/IECore/FastFloat.h diff --git a/cortex-9.6.0/include/IECore/FastFloat.inl b/cortex-9.7.0/include/IECore/FastFloat.inl similarity index 100% rename from cortex-9.6.0/include/IECore/FastFloat.inl rename to cortex-9.7.0/include/IECore/FastFloat.inl diff --git a/cortex-9.6.0/include/IECore/FileIndexedIO.h b/cortex-9.7.0/include/IECore/FileIndexedIO.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileIndexedIO.h rename to cortex-9.7.0/include/IECore/FileIndexedIO.h diff --git a/cortex-9.6.0/include/IECore/FileNameParameter.h b/cortex-9.7.0/include/IECore/FileNameParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileNameParameter.h rename to cortex-9.7.0/include/IECore/FileNameParameter.h diff --git a/cortex-9.6.0/include/IECore/FileSequence.h b/cortex-9.7.0/include/IECore/FileSequence.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileSequence.h rename to cortex-9.7.0/include/IECore/FileSequence.h diff --git a/cortex-9.6.0/include/IECore/FileSequenceFunctions.h b/cortex-9.7.0/include/IECore/FileSequenceFunctions.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileSequenceFunctions.h rename to cortex-9.7.0/include/IECore/FileSequenceFunctions.h diff --git a/cortex-9.6.0/include/IECore/FileSequenceParameter.h b/cortex-9.7.0/include/IECore/FileSequenceParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileSequenceParameter.h rename to cortex-9.7.0/include/IECore/FileSequenceParameter.h diff --git a/cortex-9.6.0/include/IECore/FileSequenceVectorParameter.h b/cortex-9.7.0/include/IECore/FileSequenceVectorParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/FileSequenceVectorParameter.h rename to cortex-9.7.0/include/IECore/FileSequenceVectorParameter.h diff --git a/cortex-9.6.0/include/IECore/FilteredMessageHandler.h b/cortex-9.7.0/include/IECore/FilteredMessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/FilteredMessageHandler.h rename to cortex-9.7.0/include/IECore/FilteredMessageHandler.h diff --git a/cortex-9.6.0/include/IECore/Font.h b/cortex-9.7.0/include/IECore/Font.h similarity index 100% rename from cortex-9.6.0/include/IECore/Font.h rename to cortex-9.7.0/include/IECore/Font.h diff --git a/cortex-9.6.0/include/IECore/FrameList.h b/cortex-9.7.0/include/IECore/FrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/FrameList.h rename to cortex-9.7.0/include/IECore/FrameList.h diff --git a/cortex-9.6.0/include/IECore/FrameList.inl b/cortex-9.7.0/include/IECore/FrameList.inl similarity index 100% rename from cortex-9.6.0/include/IECore/FrameList.inl rename to cortex-9.7.0/include/IECore/FrameList.inl diff --git a/cortex-9.6.0/include/IECore/FrameListParameter.h b/cortex-9.7.0/include/IECore/FrameListParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/FrameListParameter.h rename to cortex-9.7.0/include/IECore/FrameListParameter.h diff --git a/cortex-9.6.0/include/IECore/FrameRange.h b/cortex-9.7.0/include/IECore/FrameRange.h similarity index 100% rename from cortex-9.6.0/include/IECore/FrameRange.h rename to cortex-9.7.0/include/IECore/FrameRange.h diff --git a/cortex-9.6.0/include/IECore/FromCoreConverter.h b/cortex-9.7.0/include/IECore/FromCoreConverter.h similarity index 100% rename from cortex-9.6.0/include/IECore/FromCoreConverter.h rename to cortex-9.7.0/include/IECore/FromCoreConverter.h diff --git a/cortex-9.6.0/include/IECore/GeometricTypedData.h b/cortex-9.7.0/include/IECore/GeometricTypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/GeometricTypedData.h rename to cortex-9.7.0/include/IECore/GeometricTypedData.h diff --git a/cortex-9.6.0/include/IECore/GeometricTypedData.inl b/cortex-9.7.0/include/IECore/GeometricTypedData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/GeometricTypedData.inl rename to cortex-9.7.0/include/IECore/GeometricTypedData.inl diff --git a/cortex-9.6.0/include/IECore/GeometricTypedDataInterpolator.inl b/cortex-9.7.0/include/IECore/GeometricTypedDataInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/GeometricTypedDataInterpolator.inl rename to cortex-9.7.0/include/IECore/GeometricTypedDataInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/Grade.h b/cortex-9.7.0/include/IECore/Grade.h similarity index 100% rename from cortex-9.6.0/include/IECore/Grade.h rename to cortex-9.7.0/include/IECore/Grade.h diff --git a/cortex-9.6.0/include/IECore/Group.h b/cortex-9.7.0/include/IECore/Group.h similarity index 100% rename from cortex-9.6.0/include/IECore/Group.h rename to cortex-9.7.0/include/IECore/Group.h diff --git a/cortex-9.6.0/include/IECore/HalfTypeTraits.h b/cortex-9.7.0/include/IECore/HalfTypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/HalfTypeTraits.h rename to cortex-9.7.0/include/IECore/HalfTypeTraits.h diff --git a/cortex-9.6.0/include/IECore/HdrMergeOp.h b/cortex-9.7.0/include/IECore/HdrMergeOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/HdrMergeOp.h rename to cortex-9.7.0/include/IECore/HdrMergeOp.h diff --git a/cortex-9.6.0/include/IECore/HeaderGenerator.h b/cortex-9.7.0/include/IECore/HeaderGenerator.h similarity index 100% rename from cortex-9.6.0/include/IECore/HeaderGenerator.h rename to cortex-9.7.0/include/IECore/HeaderGenerator.h diff --git a/cortex-9.6.0/include/IECore/HenyeyGreenstein.h b/cortex-9.7.0/include/IECore/HenyeyGreenstein.h similarity index 100% rename from cortex-9.6.0/include/IECore/HenyeyGreenstein.h rename to cortex-9.7.0/include/IECore/HenyeyGreenstein.h diff --git a/cortex-9.6.0/include/IECore/HenyeyGreenstein.inl b/cortex-9.7.0/include/IECore/HenyeyGreenstein.inl similarity index 100% rename from cortex-9.6.0/include/IECore/HenyeyGreenstein.inl rename to cortex-9.7.0/include/IECore/HenyeyGreenstein.inl diff --git a/cortex-9.6.0/include/IECore/HexConversion.h b/cortex-9.7.0/include/IECore/HexConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/HexConversion.h rename to cortex-9.7.0/include/IECore/HexConversion.h diff --git a/cortex-9.6.0/include/IECore/IECore.h b/cortex-9.7.0/include/IECore/IECore.h similarity index 100% rename from cortex-9.6.0/include/IECore/IECore.h rename to cortex-9.7.0/include/IECore/IECore.h diff --git a/cortex-9.6.0/include/IECore/IFFFile.h b/cortex-9.7.0/include/IECore/IFFFile.h similarity index 100% rename from cortex-9.6.0/include/IECore/IFFFile.h rename to cortex-9.7.0/include/IECore/IFFFile.h diff --git a/cortex-9.6.0/include/IECore/IFFFile.inl b/cortex-9.7.0/include/IECore/IFFFile.inl similarity index 100% rename from cortex-9.6.0/include/IECore/IFFFile.inl rename to cortex-9.7.0/include/IECore/IFFFile.inl diff --git a/cortex-9.6.0/include/IECore/ImageCompositeOp.h b/cortex-9.7.0/include/IECore/ImageCompositeOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageCompositeOp.h rename to cortex-9.7.0/include/IECore/ImageCompositeOp.h diff --git a/cortex-9.6.0/include/IECore/ImageCropOp.h b/cortex-9.7.0/include/IECore/ImageCropOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageCropOp.h rename to cortex-9.7.0/include/IECore/ImageCropOp.h diff --git a/cortex-9.6.0/include/IECore/ImageDiffOp.h b/cortex-9.7.0/include/IECore/ImageDiffOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageDiffOp.h rename to cortex-9.7.0/include/IECore/ImageDiffOp.h diff --git a/cortex-9.6.0/include/IECore/ImageDisplayDriver.h b/cortex-9.7.0/include/IECore/ImageDisplayDriver.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageDisplayDriver.h rename to cortex-9.7.0/include/IECore/ImageDisplayDriver.h diff --git a/cortex-9.6.0/include/IECore/ImagePremultiplyOp.h b/cortex-9.7.0/include/IECore/ImagePremultiplyOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImagePremultiplyOp.h rename to cortex-9.7.0/include/IECore/ImagePremultiplyOp.h diff --git a/cortex-9.6.0/include/IECore/ImagePrimitive.h b/cortex-9.7.0/include/IECore/ImagePrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImagePrimitive.h rename to cortex-9.7.0/include/IECore/ImagePrimitive.h diff --git a/cortex-9.6.0/include/IECore/ImagePrimitive.inl b/cortex-9.7.0/include/IECore/ImagePrimitive.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ImagePrimitive.inl rename to cortex-9.7.0/include/IECore/ImagePrimitive.inl diff --git a/cortex-9.6.0/include/IECore/ImagePrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/ImagePrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImagePrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/ImagePrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/ImageReader.h b/cortex-9.7.0/include/IECore/ImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageReader.h rename to cortex-9.7.0/include/IECore/ImageReader.h diff --git a/cortex-9.6.0/include/IECore/ImageThinner.h b/cortex-9.7.0/include/IECore/ImageThinner.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageThinner.h rename to cortex-9.7.0/include/IECore/ImageThinner.h diff --git a/cortex-9.6.0/include/IECore/ImageUnpremultiplyOp.h b/cortex-9.7.0/include/IECore/ImageUnpremultiplyOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageUnpremultiplyOp.h rename to cortex-9.7.0/include/IECore/ImageUnpremultiplyOp.h diff --git a/cortex-9.6.0/include/IECore/ImageWriter.h b/cortex-9.7.0/include/IECore/ImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImageWriter.h rename to cortex-9.7.0/include/IECore/ImageWriter.h diff --git a/cortex-9.6.0/include/IECore/ImathRandAdapter.h b/cortex-9.7.0/include/IECore/ImathRandAdapter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ImathRandAdapter.h rename to cortex-9.7.0/include/IECore/ImathRandAdapter.h diff --git a/cortex-9.6.0/include/IECore/IndexedIO.h b/cortex-9.7.0/include/IECore/IndexedIO.h similarity index 100% rename from cortex-9.6.0/include/IECore/IndexedIO.h rename to cortex-9.7.0/include/IECore/IndexedIO.h diff --git a/cortex-9.6.0/include/IECore/IndexedIO.inl b/cortex-9.7.0/include/IECore/IndexedIO.inl similarity index 100% rename from cortex-9.6.0/include/IECore/IndexedIO.inl rename to cortex-9.7.0/include/IECore/IndexedIO.inl diff --git a/cortex-9.6.0/include/IECore/InternedString.h b/cortex-9.7.0/include/IECore/InternedString.h similarity index 100% rename from cortex-9.6.0/include/IECore/InternedString.h rename to cortex-9.7.0/include/IECore/InternedString.h diff --git a/cortex-9.6.0/include/IECore/InternedString.inl b/cortex-9.7.0/include/IECore/InternedString.inl similarity index 100% rename from cortex-9.6.0/include/IECore/InternedString.inl rename to cortex-9.7.0/include/IECore/InternedString.inl diff --git a/cortex-9.6.0/include/IECore/Interpolator.h b/cortex-9.7.0/include/IECore/Interpolator.h similarity index 100% rename from cortex-9.6.0/include/IECore/Interpolator.h rename to cortex-9.7.0/include/IECore/Interpolator.h diff --git a/cortex-9.6.0/include/IECore/Interpolator.inl b/cortex-9.7.0/include/IECore/Interpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Interpolator.inl rename to cortex-9.7.0/include/IECore/Interpolator.inl diff --git a/cortex-9.6.0/include/IECore/InverseDistanceWeightedInterpolation.h b/cortex-9.7.0/include/IECore/InverseDistanceWeightedInterpolation.h similarity index 100% rename from cortex-9.6.0/include/IECore/InverseDistanceWeightedInterpolation.h rename to cortex-9.7.0/include/IECore/InverseDistanceWeightedInterpolation.h diff --git a/cortex-9.6.0/include/IECore/InverseDistanceWeightedInterpolation.inl b/cortex-9.7.0/include/IECore/InverseDistanceWeightedInterpolation.inl similarity index 100% rename from cortex-9.6.0/include/IECore/InverseDistanceWeightedInterpolation.inl rename to cortex-9.7.0/include/IECore/InverseDistanceWeightedInterpolation.inl diff --git a/cortex-9.6.0/include/IECore/JPEGImageReader.h b/cortex-9.7.0/include/IECore/JPEGImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/JPEGImageReader.h rename to cortex-9.7.0/include/IECore/JPEGImageReader.h diff --git a/cortex-9.6.0/include/IECore/JPEGImageWriter.h b/cortex-9.7.0/include/IECore/JPEGImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/JPEGImageWriter.h rename to cortex-9.7.0/include/IECore/JPEGImageWriter.h diff --git a/cortex-9.6.0/include/IECore/KDTree.h b/cortex-9.7.0/include/IECore/KDTree.h similarity index 100% rename from cortex-9.6.0/include/IECore/KDTree.h rename to cortex-9.7.0/include/IECore/KDTree.h diff --git a/cortex-9.6.0/include/IECore/KDTree.inl b/cortex-9.7.0/include/IECore/KDTree.inl similarity index 100% rename from cortex-9.6.0/include/IECore/KDTree.inl rename to cortex-9.7.0/include/IECore/KDTree.inl diff --git a/cortex-9.6.0/include/IECore/LRUCache.h b/cortex-9.7.0/include/IECore/LRUCache.h similarity index 100% rename from cortex-9.6.0/include/IECore/LRUCache.h rename to cortex-9.7.0/include/IECore/LRUCache.h diff --git a/cortex-9.6.0/include/IECore/LRUCache.inl b/cortex-9.7.0/include/IECore/LRUCache.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LRUCache.inl rename to cortex-9.7.0/include/IECore/LRUCache.inl diff --git a/cortex-9.6.0/include/IECore/LensDistortOp.h b/cortex-9.7.0/include/IECore/LensDistortOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LensDistortOp.h rename to cortex-9.7.0/include/IECore/LensDistortOp.h diff --git a/cortex-9.6.0/include/IECore/LensModel.h b/cortex-9.7.0/include/IECore/LensModel.h similarity index 100% rename from cortex-9.6.0/include/IECore/LensModel.h rename to cortex-9.7.0/include/IECore/LensModel.h diff --git a/cortex-9.6.0/include/IECore/LensModel.inl b/cortex-9.7.0/include/IECore/LensModel.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LensModel.inl rename to cortex-9.7.0/include/IECore/LensModel.inl diff --git a/cortex-9.6.0/include/IECore/LevelFilteredMessageHandler.h b/cortex-9.7.0/include/IECore/LevelFilteredMessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/LevelFilteredMessageHandler.h rename to cortex-9.7.0/include/IECore/LevelFilteredMessageHandler.h diff --git a/cortex-9.6.0/include/IECore/LevenbergMarquardt.h b/cortex-9.7.0/include/IECore/LevenbergMarquardt.h similarity index 100% rename from cortex-9.6.0/include/IECore/LevenbergMarquardt.h rename to cortex-9.7.0/include/IECore/LevenbergMarquardt.h diff --git a/cortex-9.6.0/include/IECore/LevenbergMarquardt.inl b/cortex-9.7.0/include/IECore/LevenbergMarquardt.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LevenbergMarquardt.inl rename to cortex-9.7.0/include/IECore/LevenbergMarquardt.inl diff --git a/cortex-9.6.0/include/IECore/Light.h b/cortex-9.7.0/include/IECore/Light.h similarity index 100% rename from cortex-9.6.0/include/IECore/Light.h rename to cortex-9.7.0/include/IECore/Light.h diff --git a/cortex-9.6.0/include/IECore/LimitSmoothSkinningInfluencesOp.h b/cortex-9.7.0/include/IECore/LimitSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LimitSmoothSkinningInfluencesOp.h rename to cortex-9.7.0/include/IECore/LimitSmoothSkinningInfluencesOp.h diff --git a/cortex-9.6.0/include/IECore/LineSegment.h b/cortex-9.7.0/include/IECore/LineSegment.h similarity index 100% rename from cortex-9.6.0/include/IECore/LineSegment.h rename to cortex-9.7.0/include/IECore/LineSegment.h diff --git a/cortex-9.6.0/include/IECore/LineSegment.inl b/cortex-9.7.0/include/IECore/LineSegment.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LineSegment.inl rename to cortex-9.7.0/include/IECore/LineSegment.inl diff --git a/cortex-9.6.0/include/IECore/LinearToAlexaLogcDataConversion.h b/cortex-9.7.0/include/IECore/LinearToAlexaLogcDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToAlexaLogcDataConversion.h rename to cortex-9.7.0/include/IECore/LinearToAlexaLogcDataConversion.h diff --git a/cortex-9.6.0/include/IECore/LinearToAlexaLogcDataConversion.inl b/cortex-9.7.0/include/IECore/LinearToAlexaLogcDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToAlexaLogcDataConversion.inl rename to cortex-9.7.0/include/IECore/LinearToAlexaLogcDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/LinearToAlexaLogcOp.h b/cortex-9.7.0/include/IECore/LinearToAlexaLogcOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToAlexaLogcOp.h rename to cortex-9.7.0/include/IECore/LinearToAlexaLogcOp.h diff --git a/cortex-9.6.0/include/IECore/LinearToCineonDataConversion.h b/cortex-9.7.0/include/IECore/LinearToCineonDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToCineonDataConversion.h rename to cortex-9.7.0/include/IECore/LinearToCineonDataConversion.h diff --git a/cortex-9.6.0/include/IECore/LinearToCineonDataConversion.inl b/cortex-9.7.0/include/IECore/LinearToCineonDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToCineonDataConversion.inl rename to cortex-9.7.0/include/IECore/LinearToCineonDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/LinearToCineonOp.h b/cortex-9.7.0/include/IECore/LinearToCineonOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToCineonOp.h rename to cortex-9.7.0/include/IECore/LinearToCineonOp.h diff --git a/cortex-9.6.0/include/IECore/LinearToPanalogDataConversion.h b/cortex-9.7.0/include/IECore/LinearToPanalogDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToPanalogDataConversion.h rename to cortex-9.7.0/include/IECore/LinearToPanalogDataConversion.h diff --git a/cortex-9.6.0/include/IECore/LinearToPanalogDataConversion.inl b/cortex-9.7.0/include/IECore/LinearToPanalogDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToPanalogDataConversion.inl rename to cortex-9.7.0/include/IECore/LinearToPanalogDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/LinearToPanalogOp.h b/cortex-9.7.0/include/IECore/LinearToPanalogOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToPanalogOp.h rename to cortex-9.7.0/include/IECore/LinearToPanalogOp.h diff --git a/cortex-9.6.0/include/IECore/LinearToRec709DataConversion.h b/cortex-9.7.0/include/IECore/LinearToRec709DataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToRec709DataConversion.h rename to cortex-9.7.0/include/IECore/LinearToRec709DataConversion.h diff --git a/cortex-9.6.0/include/IECore/LinearToRec709DataConversion.inl b/cortex-9.7.0/include/IECore/LinearToRec709DataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToRec709DataConversion.inl rename to cortex-9.7.0/include/IECore/LinearToRec709DataConversion.inl diff --git a/cortex-9.6.0/include/IECore/LinearToRec709Op.h b/cortex-9.7.0/include/IECore/LinearToRec709Op.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToRec709Op.h rename to cortex-9.7.0/include/IECore/LinearToRec709Op.h diff --git a/cortex-9.6.0/include/IECore/LinearToSRGBDataConversion.h b/cortex-9.7.0/include/IECore/LinearToSRGBDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToSRGBDataConversion.h rename to cortex-9.7.0/include/IECore/LinearToSRGBDataConversion.h diff --git a/cortex-9.6.0/include/IECore/LinearToSRGBDataConversion.inl b/cortex-9.7.0/include/IECore/LinearToSRGBDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToSRGBDataConversion.inl rename to cortex-9.7.0/include/IECore/LinearToSRGBDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/LinearToSRGBOp.h b/cortex-9.7.0/include/IECore/LinearToSRGBOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinearToSRGBOp.h rename to cortex-9.7.0/include/IECore/LinearToSRGBOp.h diff --git a/cortex-9.6.0/include/IECore/LinkedScene.h b/cortex-9.7.0/include/IECore/LinkedScene.h similarity index 100% rename from cortex-9.6.0/include/IECore/LinkedScene.h rename to cortex-9.7.0/include/IECore/LinkedScene.h diff --git a/cortex-9.6.0/include/IECore/Lookup.h b/cortex-9.7.0/include/IECore/Lookup.h similarity index 100% rename from cortex-9.6.0/include/IECore/Lookup.h rename to cortex-9.7.0/include/IECore/Lookup.h diff --git a/cortex-9.6.0/include/IECore/Lookup.inl b/cortex-9.7.0/include/IECore/Lookup.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Lookup.inl rename to cortex-9.7.0/include/IECore/Lookup.inl diff --git a/cortex-9.6.0/include/IECore/LuminanceOp.h b/cortex-9.7.0/include/IECore/LuminanceOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/LuminanceOp.h rename to cortex-9.7.0/include/IECore/LuminanceOp.h diff --git a/cortex-9.6.0/include/IECore/MPlayDisplayDriver.h b/cortex-9.7.0/include/IECore/MPlayDisplayDriver.h similarity index 100% rename from cortex-9.6.0/include/IECore/MPlayDisplayDriver.h rename to cortex-9.7.0/include/IECore/MPlayDisplayDriver.h diff --git a/cortex-9.6.0/include/IECore/Math.h b/cortex-9.7.0/include/IECore/Math.h similarity index 100% rename from cortex-9.6.0/include/IECore/Math.h rename to cortex-9.7.0/include/IECore/Math.h diff --git a/cortex-9.6.0/include/IECore/Math.inl b/cortex-9.7.0/include/IECore/Math.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Math.inl rename to cortex-9.7.0/include/IECore/Math.inl diff --git a/cortex-9.6.0/include/IECore/MatrixAlgo.h b/cortex-9.7.0/include/IECore/MatrixAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixAlgo.h rename to cortex-9.7.0/include/IECore/MatrixAlgo.h diff --git a/cortex-9.6.0/include/IECore/MatrixAlgo.inl b/cortex-9.7.0/include/IECore/MatrixAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixAlgo.inl rename to cortex-9.7.0/include/IECore/MatrixAlgo.inl diff --git a/cortex-9.6.0/include/IECore/MatrixInterpolator.inl b/cortex-9.7.0/include/IECore/MatrixInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixInterpolator.inl rename to cortex-9.7.0/include/IECore/MatrixInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/MatrixMotionTransform.h b/cortex-9.7.0/include/IECore/MatrixMotionTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixMotionTransform.h rename to cortex-9.7.0/include/IECore/MatrixMotionTransform.h diff --git a/cortex-9.6.0/include/IECore/MatrixMultiplyOp.h b/cortex-9.7.0/include/IECore/MatrixMultiplyOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixMultiplyOp.h rename to cortex-9.7.0/include/IECore/MatrixMultiplyOp.h diff --git a/cortex-9.6.0/include/IECore/MatrixOps.h b/cortex-9.7.0/include/IECore/MatrixOps.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixOps.h rename to cortex-9.7.0/include/IECore/MatrixOps.h diff --git a/cortex-9.6.0/include/IECore/MatrixOps.inl b/cortex-9.7.0/include/IECore/MatrixOps.inl similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixOps.inl rename to cortex-9.7.0/include/IECore/MatrixOps.inl diff --git a/cortex-9.6.0/include/IECore/MatrixTraits.h b/cortex-9.7.0/include/IECore/MatrixTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixTraits.h rename to cortex-9.7.0/include/IECore/MatrixTraits.h diff --git a/cortex-9.6.0/include/IECore/MatrixTransform.h b/cortex-9.7.0/include/IECore/MatrixTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/MatrixTransform.h rename to cortex-9.7.0/include/IECore/MatrixTransform.h diff --git a/cortex-9.6.0/include/IECore/MeanSquaredError.h b/cortex-9.7.0/include/IECore/MeanSquaredError.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeanSquaredError.h rename to cortex-9.7.0/include/IECore/MeanSquaredError.h diff --git a/cortex-9.6.0/include/IECore/MeanSquaredError.inl b/cortex-9.7.0/include/IECore/MeanSquaredError.inl similarity index 100% rename from cortex-9.6.0/include/IECore/MeanSquaredError.inl rename to cortex-9.7.0/include/IECore/MeanSquaredError.inl diff --git a/cortex-9.6.0/include/IECore/MedianCutSampler.h b/cortex-9.7.0/include/IECore/MedianCutSampler.h similarity index 100% rename from cortex-9.6.0/include/IECore/MedianCutSampler.h rename to cortex-9.7.0/include/IECore/MedianCutSampler.h diff --git a/cortex-9.6.0/include/IECore/MemoryIndexedIO.h b/cortex-9.7.0/include/IECore/MemoryIndexedIO.h similarity index 100% rename from cortex-9.6.0/include/IECore/MemoryIndexedIO.h rename to cortex-9.7.0/include/IECore/MemoryIndexedIO.h diff --git a/cortex-9.6.0/include/IECore/MemoryStream.h b/cortex-9.7.0/include/IECore/MemoryStream.h similarity index 100% rename from cortex-9.6.0/include/IECore/MemoryStream.h rename to cortex-9.7.0/include/IECore/MemoryStream.h diff --git a/cortex-9.6.0/include/IECore/MeshDistortionsOp.h b/cortex-9.7.0/include/IECore/MeshDistortionsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshDistortionsOp.h rename to cortex-9.7.0/include/IECore/MeshDistortionsOp.h diff --git a/cortex-9.6.0/include/IECore/MeshFaceFilterOp.h b/cortex-9.7.0/include/IECore/MeshFaceFilterOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshFaceFilterOp.h rename to cortex-9.7.0/include/IECore/MeshFaceFilterOp.h diff --git a/cortex-9.6.0/include/IECore/MeshMergeOp.h b/cortex-9.7.0/include/IECore/MeshMergeOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshMergeOp.h rename to cortex-9.7.0/include/IECore/MeshMergeOp.h diff --git a/cortex-9.6.0/include/IECore/MeshNormalsOp.h b/cortex-9.7.0/include/IECore/MeshNormalsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshNormalsOp.h rename to cortex-9.7.0/include/IECore/MeshNormalsOp.h diff --git a/cortex-9.6.0/include/IECore/MeshPrimitive.h b/cortex-9.7.0/include/IECore/MeshPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshPrimitive.h rename to cortex-9.7.0/include/IECore/MeshPrimitive.h diff --git a/cortex-9.6.0/include/IECore/MeshPrimitiveBuilder.h b/cortex-9.7.0/include/IECore/MeshPrimitiveBuilder.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshPrimitiveBuilder.h rename to cortex-9.7.0/include/IECore/MeshPrimitiveBuilder.h diff --git a/cortex-9.6.0/include/IECore/MeshPrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/MeshPrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshPrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/MeshPrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/MeshPrimitiveShrinkWrapOp.h b/cortex-9.7.0/include/IECore/MeshPrimitiveShrinkWrapOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshPrimitiveShrinkWrapOp.h rename to cortex-9.7.0/include/IECore/MeshPrimitiveShrinkWrapOp.h diff --git a/cortex-9.6.0/include/IECore/MeshTangentsOp.h b/cortex-9.7.0/include/IECore/MeshTangentsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshTangentsOp.h rename to cortex-9.7.0/include/IECore/MeshTangentsOp.h diff --git a/cortex-9.6.0/include/IECore/MeshVertexReorderOp.h b/cortex-9.7.0/include/IECore/MeshVertexReorderOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MeshVertexReorderOp.h rename to cortex-9.7.0/include/IECore/MeshVertexReorderOp.h diff --git a/cortex-9.6.0/include/IECore/MessageHandler.h b/cortex-9.7.0/include/IECore/MessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/MessageHandler.h rename to cortex-9.7.0/include/IECore/MessageHandler.h diff --git a/cortex-9.6.0/include/IECore/MixSmoothSkinningWeightsOp.h b/cortex-9.7.0/include/IECore/MixSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/MixSmoothSkinningWeightsOp.h rename to cortex-9.7.0/include/IECore/MixSmoothSkinningWeightsOp.h diff --git a/cortex-9.6.0/include/IECore/ModifyOp.h b/cortex-9.7.0/include/IECore/ModifyOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ModifyOp.h rename to cortex-9.7.0/include/IECore/ModifyOp.h diff --git a/cortex-9.6.0/include/IECore/MotionBlock.h b/cortex-9.7.0/include/IECore/MotionBlock.h similarity index 100% rename from cortex-9.6.0/include/IECore/MotionBlock.h rename to cortex-9.7.0/include/IECore/MotionBlock.h diff --git a/cortex-9.6.0/include/IECore/MotionPrimitive.h b/cortex-9.7.0/include/IECore/MotionPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/MotionPrimitive.h rename to cortex-9.7.0/include/IECore/MotionPrimitive.h diff --git a/cortex-9.6.0/include/IECore/MurmurHash.h b/cortex-9.7.0/include/IECore/MurmurHash.h similarity index 100% rename from cortex-9.6.0/include/IECore/MurmurHash.h rename to cortex-9.7.0/include/IECore/MurmurHash.h diff --git a/cortex-9.6.0/include/IECore/MurmurHash.inl b/cortex-9.7.0/include/IECore/MurmurHash.inl similarity index 100% rename from cortex-9.6.0/include/IECore/MurmurHash.inl rename to cortex-9.7.0/include/IECore/MurmurHash.inl diff --git a/cortex-9.6.0/include/IECore/NParticleReader.h b/cortex-9.7.0/include/IECore/NParticleReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/NParticleReader.h rename to cortex-9.7.0/include/IECore/NParticleReader.h diff --git a/cortex-9.6.0/include/IECore/NURBSPrimitive.h b/cortex-9.7.0/include/IECore/NURBSPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/NURBSPrimitive.h rename to cortex-9.7.0/include/IECore/NURBSPrimitive.h diff --git a/cortex-9.6.0/include/IECore/NormalizeSmoothSkinningWeightsOp.h b/cortex-9.7.0/include/IECore/NormalizeSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/NormalizeSmoothSkinningWeightsOp.h rename to cortex-9.7.0/include/IECore/NormalizeSmoothSkinningWeightsOp.h diff --git a/cortex-9.6.0/include/IECore/NullMessageHandler.h b/cortex-9.7.0/include/IECore/NullMessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/NullMessageHandler.h rename to cortex-9.7.0/include/IECore/NullMessageHandler.h diff --git a/cortex-9.6.0/include/IECore/NullObject.h b/cortex-9.7.0/include/IECore/NullObject.h similarity index 100% rename from cortex-9.6.0/include/IECore/NullObject.h rename to cortex-9.7.0/include/IECore/NullObject.h diff --git a/cortex-9.6.0/include/IECore/NumericParameter.h b/cortex-9.7.0/include/IECore/NumericParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/NumericParameter.h rename to cortex-9.7.0/include/IECore/NumericParameter.h diff --git a/cortex-9.6.0/include/IECore/OBJReader.h b/cortex-9.7.0/include/IECore/OBJReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/OBJReader.h rename to cortex-9.7.0/include/IECore/OBJReader.h diff --git a/cortex-9.6.0/include/IECore/OStreamMessageHandler.h b/cortex-9.7.0/include/IECore/OStreamMessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/OStreamMessageHandler.h rename to cortex-9.7.0/include/IECore/OStreamMessageHandler.h diff --git a/cortex-9.6.0/include/IECore/Object.h b/cortex-9.7.0/include/IECore/Object.h similarity index 100% rename from cortex-9.6.0/include/IECore/Object.h rename to cortex-9.7.0/include/IECore/Object.h diff --git a/cortex-9.6.0/include/IECore/Object.inl b/cortex-9.7.0/include/IECore/Object.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Object.inl rename to cortex-9.7.0/include/IECore/Object.inl diff --git a/cortex-9.6.0/include/IECore/ObjectInterpolator.h b/cortex-9.7.0/include/IECore/ObjectInterpolator.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectInterpolator.h rename to cortex-9.7.0/include/IECore/ObjectInterpolator.h diff --git a/cortex-9.6.0/include/IECore/ObjectParameter.h b/cortex-9.7.0/include/IECore/ObjectParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectParameter.h rename to cortex-9.7.0/include/IECore/ObjectParameter.h diff --git a/cortex-9.6.0/include/IECore/ObjectPool.h b/cortex-9.7.0/include/IECore/ObjectPool.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectPool.h rename to cortex-9.7.0/include/IECore/ObjectPool.h diff --git a/cortex-9.6.0/include/IECore/ObjectReader.h b/cortex-9.7.0/include/IECore/ObjectReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectReader.h rename to cortex-9.7.0/include/IECore/ObjectReader.h diff --git a/cortex-9.6.0/include/IECore/ObjectVector.h b/cortex-9.7.0/include/IECore/ObjectVector.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectVector.h rename to cortex-9.7.0/include/IECore/ObjectVector.h diff --git a/cortex-9.6.0/include/IECore/ObjectWriter.h b/cortex-9.7.0/include/IECore/ObjectWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ObjectWriter.h rename to cortex-9.7.0/include/IECore/ObjectWriter.h diff --git a/cortex-9.6.0/include/IECore/Op.h b/cortex-9.7.0/include/IECore/Op.h similarity index 100% rename from cortex-9.6.0/include/IECore/Op.h rename to cortex-9.7.0/include/IECore/Op.h diff --git a/cortex-9.6.0/include/IECore/Options.h b/cortex-9.7.0/include/IECore/Options.h similarity index 100% rename from cortex-9.6.0/include/IECore/Options.h rename to cortex-9.7.0/include/IECore/Options.h diff --git a/cortex-9.6.0/include/IECore/OversamplesCalculator.h b/cortex-9.7.0/include/IECore/OversamplesCalculator.h similarity index 100% rename from cortex-9.6.0/include/IECore/OversamplesCalculator.h rename to cortex-9.7.0/include/IECore/OversamplesCalculator.h diff --git a/cortex-9.6.0/include/IECore/OversamplesCalculator.inl b/cortex-9.7.0/include/IECore/OversamplesCalculator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/OversamplesCalculator.inl rename to cortex-9.7.0/include/IECore/OversamplesCalculator.inl diff --git a/cortex-9.6.0/include/IECore/PDCParticleReader.h b/cortex-9.7.0/include/IECore/PDCParticleReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/PDCParticleReader.h rename to cortex-9.7.0/include/IECore/PDCParticleReader.h diff --git a/cortex-9.6.0/include/IECore/PDCParticleWriter.h b/cortex-9.7.0/include/IECore/PDCParticleWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/PDCParticleWriter.h rename to cortex-9.7.0/include/IECore/PDCParticleWriter.h diff --git a/cortex-9.6.0/include/IECore/PNGImageReader.h b/cortex-9.7.0/include/IECore/PNGImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/PNGImageReader.h rename to cortex-9.7.0/include/IECore/PNGImageReader.h diff --git a/cortex-9.6.0/include/IECore/PanalogToLinearDataConversion.h b/cortex-9.7.0/include/IECore/PanalogToLinearDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/PanalogToLinearDataConversion.h rename to cortex-9.7.0/include/IECore/PanalogToLinearDataConversion.h diff --git a/cortex-9.6.0/include/IECore/PanalogToLinearDataConversion.inl b/cortex-9.7.0/include/IECore/PanalogToLinearDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PanalogToLinearDataConversion.inl rename to cortex-9.7.0/include/IECore/PanalogToLinearDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/PanalogToLinearOp.h b/cortex-9.7.0/include/IECore/PanalogToLinearOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PanalogToLinearOp.h rename to cortex-9.7.0/include/IECore/PanalogToLinearOp.h diff --git a/cortex-9.6.0/include/IECore/Parameter.h b/cortex-9.7.0/include/IECore/Parameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/Parameter.h rename to cortex-9.7.0/include/IECore/Parameter.h diff --git a/cortex-9.6.0/include/IECore/Parameter.inl b/cortex-9.7.0/include/IECore/Parameter.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Parameter.inl rename to cortex-9.7.0/include/IECore/Parameter.inl diff --git a/cortex-9.6.0/include/IECore/Parameterised.h b/cortex-9.7.0/include/IECore/Parameterised.h similarity index 100% rename from cortex-9.6.0/include/IECore/Parameterised.h rename to cortex-9.7.0/include/IECore/Parameterised.h diff --git a/cortex-9.6.0/include/IECore/ParameterisedInterface.h b/cortex-9.7.0/include/IECore/ParameterisedInterface.h similarity index 100% rename from cortex-9.6.0/include/IECore/ParameterisedInterface.h rename to cortex-9.7.0/include/IECore/ParameterisedInterface.h diff --git a/cortex-9.6.0/include/IECore/ParameterisedProcedural.h b/cortex-9.7.0/include/IECore/ParameterisedProcedural.h similarity index 100% rename from cortex-9.6.0/include/IECore/ParameterisedProcedural.h rename to cortex-9.7.0/include/IECore/ParameterisedProcedural.h diff --git a/cortex-9.6.0/include/IECore/ParticleReader.h b/cortex-9.7.0/include/IECore/ParticleReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/ParticleReader.h rename to cortex-9.7.0/include/IECore/ParticleReader.h diff --git a/cortex-9.6.0/include/IECore/ParticleReader.inl b/cortex-9.7.0/include/IECore/ParticleReader.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ParticleReader.inl rename to cortex-9.7.0/include/IECore/ParticleReader.inl diff --git a/cortex-9.6.0/include/IECore/ParticleWriter.h b/cortex-9.7.0/include/IECore/ParticleWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ParticleWriter.h rename to cortex-9.7.0/include/IECore/ParticleWriter.h diff --git a/cortex-9.6.0/include/IECore/PatchMeshPrimitive.h b/cortex-9.7.0/include/IECore/PatchMeshPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/PatchMeshPrimitive.h rename to cortex-9.7.0/include/IECore/PatchMeshPrimitive.h diff --git a/cortex-9.6.0/include/IECore/PathParameter.h b/cortex-9.7.0/include/IECore/PathParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/PathParameter.h rename to cortex-9.7.0/include/IECore/PathParameter.h diff --git a/cortex-9.6.0/include/IECore/PathVectorParameter.h b/cortex-9.7.0/include/IECore/PathVectorParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/PathVectorParameter.h rename to cortex-9.7.0/include/IECore/PathVectorParameter.h diff --git a/cortex-9.6.0/include/IECore/PerlinNoise.h b/cortex-9.7.0/include/IECore/PerlinNoise.h similarity index 100% rename from cortex-9.6.0/include/IECore/PerlinNoise.h rename to cortex-9.7.0/include/IECore/PerlinNoise.h diff --git a/cortex-9.6.0/include/IECore/PerlinNoise.inl b/cortex-9.7.0/include/IECore/PerlinNoise.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PerlinNoise.inl rename to cortex-9.7.0/include/IECore/PerlinNoise.inl diff --git a/cortex-9.6.0/include/IECore/PointBoundsOp.h b/cortex-9.7.0/include/IECore/PointBoundsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointBoundsOp.h rename to cortex-9.7.0/include/IECore/PointBoundsOp.h diff --git a/cortex-9.6.0/include/IECore/PointDensitiesOp.h b/cortex-9.7.0/include/IECore/PointDensitiesOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointDensitiesOp.h rename to cortex-9.7.0/include/IECore/PointDensitiesOp.h diff --git a/cortex-9.6.0/include/IECore/PointDistribution.h b/cortex-9.7.0/include/IECore/PointDistribution.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointDistribution.h rename to cortex-9.7.0/include/IECore/PointDistribution.h diff --git a/cortex-9.6.0/include/IECore/PointDistribution.inl b/cortex-9.7.0/include/IECore/PointDistribution.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PointDistribution.inl rename to cortex-9.7.0/include/IECore/PointDistribution.inl diff --git a/cortex-9.6.0/include/IECore/PointDistributionOp.h b/cortex-9.7.0/include/IECore/PointDistributionOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointDistributionOp.h rename to cortex-9.7.0/include/IECore/PointDistributionOp.h diff --git a/cortex-9.6.0/include/IECore/PointNormalsOp.h b/cortex-9.7.0/include/IECore/PointNormalsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointNormalsOp.h rename to cortex-9.7.0/include/IECore/PointNormalsOp.h diff --git a/cortex-9.6.0/include/IECore/PointRepulsionOp.h b/cortex-9.7.0/include/IECore/PointRepulsionOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointRepulsionOp.h rename to cortex-9.7.0/include/IECore/PointRepulsionOp.h diff --git a/cortex-9.6.0/include/IECore/PointSmoothSkinningOp.h b/cortex-9.7.0/include/IECore/PointSmoothSkinningOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointSmoothSkinningOp.h rename to cortex-9.7.0/include/IECore/PointSmoothSkinningOp.h diff --git a/cortex-9.6.0/include/IECore/PointVelocityDisplaceOp.h b/cortex-9.7.0/include/IECore/PointVelocityDisplaceOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointVelocityDisplaceOp.h rename to cortex-9.7.0/include/IECore/PointVelocityDisplaceOp.h diff --git a/cortex-9.6.0/include/IECore/PointsMotionOp.h b/cortex-9.7.0/include/IECore/PointsMotionOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointsMotionOp.h rename to cortex-9.7.0/include/IECore/PointsMotionOp.h diff --git a/cortex-9.6.0/include/IECore/PointsPrimitive.h b/cortex-9.7.0/include/IECore/PointsPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointsPrimitive.h rename to cortex-9.7.0/include/IECore/PointsPrimitive.h diff --git a/cortex-9.6.0/include/IECore/PointsPrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/PointsPrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/PointsPrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/PointsPrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/PolygonAlgo.h b/cortex-9.7.0/include/IECore/PolygonAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonAlgo.h rename to cortex-9.7.0/include/IECore/PolygonAlgo.h diff --git a/cortex-9.6.0/include/IECore/PolygonAlgo.inl b/cortex-9.7.0/include/IECore/PolygonAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonAlgo.inl rename to cortex-9.7.0/include/IECore/PolygonAlgo.inl diff --git a/cortex-9.6.0/include/IECore/PolygonIterator.h b/cortex-9.7.0/include/IECore/PolygonIterator.h similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonIterator.h rename to cortex-9.7.0/include/IECore/PolygonIterator.h diff --git a/cortex-9.6.0/include/IECore/PolygonIterator.inl b/cortex-9.7.0/include/IECore/PolygonIterator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonIterator.inl rename to cortex-9.7.0/include/IECore/PolygonIterator.inl diff --git a/cortex-9.6.0/include/IECore/PolygonVertexIterator.h b/cortex-9.7.0/include/IECore/PolygonVertexIterator.h similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonVertexIterator.h rename to cortex-9.7.0/include/IECore/PolygonVertexIterator.h diff --git a/cortex-9.6.0/include/IECore/PolygonVertexIterator.inl b/cortex-9.7.0/include/IECore/PolygonVertexIterator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/PolygonVertexIterator.inl rename to cortex-9.7.0/include/IECore/PolygonVertexIterator.inl diff --git a/cortex-9.6.0/include/IECore/PreWorldRenderable.h b/cortex-9.7.0/include/IECore/PreWorldRenderable.h similarity index 100% rename from cortex-9.6.0/include/IECore/PreWorldRenderable.h rename to cortex-9.7.0/include/IECore/PreWorldRenderable.h diff --git a/cortex-9.6.0/include/IECore/Primitive.h b/cortex-9.7.0/include/IECore/Primitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/Primitive.h rename to cortex-9.7.0/include/IECore/Primitive.h diff --git a/cortex-9.6.0/include/IECore/Primitive.inl b/cortex-9.7.0/include/IECore/Primitive.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Primitive.inl rename to cortex-9.7.0/include/IECore/Primitive.inl diff --git a/cortex-9.6.0/include/IECore/PrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/PrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/PrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/PrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/PrimitiveOp.h b/cortex-9.7.0/include/IECore/PrimitiveOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/PrimitiveOp.h rename to cortex-9.7.0/include/IECore/PrimitiveOp.h diff --git a/cortex-9.6.0/include/IECore/PrimitiveVariable.h b/cortex-9.7.0/include/IECore/PrimitiveVariable.h similarity index 100% rename from cortex-9.6.0/include/IECore/PrimitiveVariable.h rename to cortex-9.7.0/include/IECore/PrimitiveVariable.h diff --git a/cortex-9.6.0/include/IECore/QuatAlgo.h b/cortex-9.7.0/include/IECore/QuatAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/QuatAlgo.h rename to cortex-9.7.0/include/IECore/QuatAlgo.h diff --git a/cortex-9.6.0/include/IECore/QuatInterpolator.inl b/cortex-9.7.0/include/IECore/QuatInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/QuatInterpolator.inl rename to cortex-9.7.0/include/IECore/QuatInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/RGBToXYZColorTransform.h b/cortex-9.7.0/include/IECore/RGBToXYZColorTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/RGBToXYZColorTransform.h rename to cortex-9.7.0/include/IECore/RGBToXYZColorTransform.h diff --git a/cortex-9.6.0/include/IECore/RGBToXYZColorTransform.inl b/cortex-9.7.0/include/IECore/RGBToXYZColorTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/RGBToXYZColorTransform.inl rename to cortex-9.7.0/include/IECore/RGBToXYZColorTransform.inl diff --git a/cortex-9.6.0/include/IECore/RadixSort.h b/cortex-9.7.0/include/IECore/RadixSort.h similarity index 100% rename from cortex-9.6.0/include/IECore/RadixSort.h rename to cortex-9.7.0/include/IECore/RadixSort.h diff --git a/cortex-9.6.0/include/IECore/Random.h b/cortex-9.7.0/include/IECore/Random.h similarity index 100% rename from cortex-9.6.0/include/IECore/Random.h rename to cortex-9.7.0/include/IECore/Random.h diff --git a/cortex-9.6.0/include/IECore/Random.inl b/cortex-9.7.0/include/IECore/Random.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Random.inl rename to cortex-9.7.0/include/IECore/Random.inl diff --git a/cortex-9.6.0/include/IECore/RandomRotationOp.h b/cortex-9.7.0/include/IECore/RandomRotationOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/RandomRotationOp.h rename to cortex-9.7.0/include/IECore/RandomRotationOp.h diff --git a/cortex-9.6.0/include/IECore/RandomRotationOp.inl b/cortex-9.7.0/include/IECore/RandomRotationOp.inl similarity index 100% rename from cortex-9.6.0/include/IECore/RandomRotationOp.inl rename to cortex-9.7.0/include/IECore/RandomRotationOp.inl diff --git a/cortex-9.6.0/include/IECore/Reader.h b/cortex-9.7.0/include/IECore/Reader.h similarity index 100% rename from cortex-9.6.0/include/IECore/Reader.h rename to cortex-9.7.0/include/IECore/Reader.h diff --git a/cortex-9.6.0/include/IECore/Reader.inl b/cortex-9.7.0/include/IECore/Reader.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Reader.inl rename to cortex-9.7.0/include/IECore/Reader.inl diff --git a/cortex-9.6.0/include/IECore/Rec709ToLinearDataConversion.h b/cortex-9.7.0/include/IECore/Rec709ToLinearDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/Rec709ToLinearDataConversion.h rename to cortex-9.7.0/include/IECore/Rec709ToLinearDataConversion.h diff --git a/cortex-9.6.0/include/IECore/Rec709ToLinearDataConversion.inl b/cortex-9.7.0/include/IECore/Rec709ToLinearDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Rec709ToLinearDataConversion.inl rename to cortex-9.7.0/include/IECore/Rec709ToLinearDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/Rec709ToLinearOp.h b/cortex-9.7.0/include/IECore/Rec709ToLinearOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/Rec709ToLinearOp.h rename to cortex-9.7.0/include/IECore/Rec709ToLinearOp.h diff --git a/cortex-9.6.0/include/IECore/RefCounted.h b/cortex-9.7.0/include/IECore/RefCounted.h similarity index 100% rename from cortex-9.6.0/include/IECore/RefCounted.h rename to cortex-9.7.0/include/IECore/RefCounted.h diff --git a/cortex-9.6.0/include/IECore/RemoveSmoothSkinningInfluencesOp.h b/cortex-9.7.0/include/IECore/RemoveSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/RemoveSmoothSkinningInfluencesOp.h rename to cortex-9.7.0/include/IECore/RemoveSmoothSkinningInfluencesOp.h diff --git a/cortex-9.6.0/include/IECore/Renderable.h b/cortex-9.7.0/include/IECore/Renderable.h similarity index 100% rename from cortex-9.6.0/include/IECore/Renderable.h rename to cortex-9.7.0/include/IECore/Renderable.h diff --git a/cortex-9.6.0/include/IECore/Renderer.h b/cortex-9.7.0/include/IECore/Renderer.h similarity index 100% rename from cortex-9.6.0/include/IECore/Renderer.h rename to cortex-9.7.0/include/IECore/Renderer.h diff --git a/cortex-9.6.0/include/IECore/ReorderSmoothSkinningInfluencesOp.h b/cortex-9.7.0/include/IECore/ReorderSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/ReorderSmoothSkinningInfluencesOp.h rename to cortex-9.7.0/include/IECore/ReorderSmoothSkinningInfluencesOp.h diff --git a/cortex-9.6.0/include/IECore/ReorderedFrameList.h b/cortex-9.7.0/include/IECore/ReorderedFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/ReorderedFrameList.h rename to cortex-9.7.0/include/IECore/ReorderedFrameList.h diff --git a/cortex-9.6.0/include/IECore/ReorderedFrameList.inl b/cortex-9.7.0/include/IECore/ReorderedFrameList.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ReorderedFrameList.inl rename to cortex-9.7.0/include/IECore/ReorderedFrameList.inl diff --git a/cortex-9.6.0/include/IECore/ReversedFrameList.h b/cortex-9.7.0/include/IECore/ReversedFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECore/ReversedFrameList.h rename to cortex-9.7.0/include/IECore/ReversedFrameList.h diff --git a/cortex-9.6.0/include/IECore/RunTimeTyped.h b/cortex-9.7.0/include/IECore/RunTimeTyped.h similarity index 100% rename from cortex-9.6.0/include/IECore/RunTimeTyped.h rename to cortex-9.7.0/include/IECore/RunTimeTyped.h diff --git a/cortex-9.6.0/include/IECore/RunTimeTyped.inl b/cortex-9.7.0/include/IECore/RunTimeTyped.inl similarity index 100% rename from cortex-9.6.0/include/IECore/RunTimeTyped.inl rename to cortex-9.7.0/include/IECore/RunTimeTyped.inl diff --git a/cortex-9.6.0/include/IECore/SGIImageReader.h b/cortex-9.7.0/include/IECore/SGIImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/SGIImageReader.h rename to cortex-9.7.0/include/IECore/SGIImageReader.h diff --git a/cortex-9.6.0/include/IECore/SRGBToLinearDataConversion.h b/cortex-9.7.0/include/IECore/SRGBToLinearDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/SRGBToLinearDataConversion.h rename to cortex-9.7.0/include/IECore/SRGBToLinearDataConversion.h diff --git a/cortex-9.6.0/include/IECore/SRGBToLinearDataConversion.inl b/cortex-9.7.0/include/IECore/SRGBToLinearDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/SRGBToLinearDataConversion.inl rename to cortex-9.7.0/include/IECore/SRGBToLinearDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/SRGBToLinearOp.h b/cortex-9.7.0/include/IECore/SRGBToLinearOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/SRGBToLinearOp.h rename to cortex-9.7.0/include/IECore/SRGBToLinearOp.h diff --git a/cortex-9.6.0/include/IECore/SampledSceneInterface.h b/cortex-9.7.0/include/IECore/SampledSceneInterface.h similarity index 100% rename from cortex-9.6.0/include/IECore/SampledSceneInterface.h rename to cortex-9.7.0/include/IECore/SampledSceneInterface.h diff --git a/cortex-9.6.0/include/IECore/ScaledDataConversion.h b/cortex-9.7.0/include/IECore/ScaledDataConversion.h similarity index 100% rename from cortex-9.6.0/include/IECore/ScaledDataConversion.h rename to cortex-9.7.0/include/IECore/ScaledDataConversion.h diff --git a/cortex-9.6.0/include/IECore/ScaledDataConversion.inl b/cortex-9.7.0/include/IECore/ScaledDataConversion.inl similarity index 100% rename from cortex-9.6.0/include/IECore/ScaledDataConversion.inl rename to cortex-9.7.0/include/IECore/ScaledDataConversion.inl diff --git a/cortex-9.6.0/include/IECore/SceneCache.h b/cortex-9.7.0/include/IECore/SceneCache.h similarity index 100% rename from cortex-9.6.0/include/IECore/SceneCache.h rename to cortex-9.7.0/include/IECore/SceneCache.h diff --git a/cortex-9.6.0/include/IECore/SceneInterface.h b/cortex-9.7.0/include/IECore/SceneInterface.h similarity index 100% rename from cortex-9.6.0/include/IECore/SceneInterface.h rename to cortex-9.7.0/include/IECore/SceneInterface.h diff --git a/cortex-9.6.0/include/IECore/SceneInterface.inl b/cortex-9.7.0/include/IECore/SceneInterface.inl similarity index 100% rename from cortex-9.6.0/include/IECore/SceneInterface.inl rename to cortex-9.7.0/include/IECore/SceneInterface.inl diff --git a/cortex-9.6.0/include/IECore/SearchPath.h b/cortex-9.7.0/include/IECore/SearchPath.h similarity index 100% rename from cortex-9.6.0/include/IECore/SearchPath.h rename to cortex-9.7.0/include/IECore/SearchPath.h diff --git a/cortex-9.6.0/include/IECore/Shader.h b/cortex-9.7.0/include/IECore/Shader.h similarity index 100% rename from cortex-9.6.0/include/IECore/Shader.h rename to cortex-9.7.0/include/IECore/Shader.h diff --git a/cortex-9.6.0/include/IECore/SharedSceneInterfaces.h b/cortex-9.7.0/include/IECore/SharedSceneInterfaces.h similarity index 100% rename from cortex-9.6.0/include/IECore/SharedSceneInterfaces.h rename to cortex-9.7.0/include/IECore/SharedSceneInterfaces.h diff --git a/cortex-9.6.0/include/IECore/SimpleTypedData.h b/cortex-9.7.0/include/IECore/SimpleTypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/SimpleTypedData.h rename to cortex-9.7.0/include/IECore/SimpleTypedData.h diff --git a/cortex-9.6.0/include/IECore/SimpleTypedParameter.h b/cortex-9.7.0/include/IECore/SimpleTypedParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/SimpleTypedParameter.h rename to cortex-9.7.0/include/IECore/SimpleTypedParameter.h diff --git a/cortex-9.6.0/include/IECore/SmoothSkinningData.h b/cortex-9.7.0/include/IECore/SmoothSkinningData.h similarity index 100% rename from cortex-9.6.0/include/IECore/SmoothSkinningData.h rename to cortex-9.7.0/include/IECore/SmoothSkinningData.h diff --git a/cortex-9.6.0/include/IECore/SmoothSmoothSkinningWeightsOp.h b/cortex-9.7.0/include/IECore/SmoothSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/SmoothSmoothSkinningWeightsOp.h rename to cortex-9.7.0/include/IECore/SmoothSmoothSkinningWeightsOp.h diff --git a/cortex-9.6.0/include/IECore/SpaceTransform.h b/cortex-9.7.0/include/IECore/SpaceTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/SpaceTransform.h rename to cortex-9.7.0/include/IECore/SpaceTransform.h diff --git a/cortex-9.6.0/include/IECore/SpherePrimitive.h b/cortex-9.7.0/include/IECore/SpherePrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECore/SpherePrimitive.h rename to cortex-9.7.0/include/IECore/SpherePrimitive.h diff --git a/cortex-9.6.0/include/IECore/SpherePrimitiveEvaluator.h b/cortex-9.7.0/include/IECore/SpherePrimitiveEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECore/SpherePrimitiveEvaluator.h rename to cortex-9.7.0/include/IECore/SpherePrimitiveEvaluator.h diff --git a/cortex-9.6.0/include/IECore/SphericalToEuclideanTransform.h b/cortex-9.7.0/include/IECore/SphericalToEuclideanTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/SphericalToEuclideanTransform.h rename to cortex-9.7.0/include/IECore/SphericalToEuclideanTransform.h diff --git a/cortex-9.6.0/include/IECore/SphericalToEuclideanTransform.inl b/cortex-9.7.0/include/IECore/SphericalToEuclideanTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/SphericalToEuclideanTransform.inl rename to cortex-9.7.0/include/IECore/SphericalToEuclideanTransform.inl diff --git a/cortex-9.6.0/include/IECore/Spline.h b/cortex-9.7.0/include/IECore/Spline.h similarity index 100% rename from cortex-9.6.0/include/IECore/Spline.h rename to cortex-9.7.0/include/IECore/Spline.h diff --git a/cortex-9.6.0/include/IECore/Spline.inl b/cortex-9.7.0/include/IECore/Spline.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Spline.inl rename to cortex-9.7.0/include/IECore/Spline.inl diff --git a/cortex-9.6.0/include/IECore/SplineData.h b/cortex-9.7.0/include/IECore/SplineData.h similarity index 100% rename from cortex-9.6.0/include/IECore/SplineData.h rename to cortex-9.7.0/include/IECore/SplineData.h diff --git a/cortex-9.6.0/include/IECore/SplineParameter.h b/cortex-9.7.0/include/IECore/SplineParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/SplineParameter.h rename to cortex-9.7.0/include/IECore/SplineParameter.h diff --git a/cortex-9.6.0/include/IECore/SplineToImage.h b/cortex-9.7.0/include/IECore/SplineToImage.h similarity index 100% rename from cortex-9.6.0/include/IECore/SplineToImage.h rename to cortex-9.7.0/include/IECore/SplineToImage.h diff --git a/cortex-9.6.0/include/IECore/StandardRadialLensModel.h b/cortex-9.7.0/include/IECore/StandardRadialLensModel.h similarity index 100% rename from cortex-9.6.0/include/IECore/StandardRadialLensModel.h rename to cortex-9.7.0/include/IECore/StandardRadialLensModel.h diff --git a/cortex-9.6.0/include/IECore/StateRenderable.h b/cortex-9.7.0/include/IECore/StateRenderable.h similarity index 100% rename from cortex-9.6.0/include/IECore/StateRenderable.h rename to cortex-9.7.0/include/IECore/StateRenderable.h diff --git a/cortex-9.6.0/include/IECore/StreamIndexedIO.h b/cortex-9.7.0/include/IECore/StreamIndexedIO.h similarity index 100% rename from cortex-9.6.0/include/IECore/StreamIndexedIO.h rename to cortex-9.7.0/include/IECore/StreamIndexedIO.h diff --git a/cortex-9.6.0/include/IECore/StringAlgo.h b/cortex-9.7.0/include/IECore/StringAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/StringAlgo.h rename to cortex-9.7.0/include/IECore/StringAlgo.h diff --git a/cortex-9.6.0/include/IECore/StringAlgo.inl b/cortex-9.7.0/include/IECore/StringAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/StringAlgo.inl rename to cortex-9.7.0/include/IECore/StringAlgo.inl diff --git a/cortex-9.6.0/include/IECore/SummedAreaOp.h b/cortex-9.7.0/include/IECore/SummedAreaOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/SummedAreaOp.h rename to cortex-9.7.0/include/IECore/SummedAreaOp.h diff --git a/cortex-9.6.0/include/IECore/SweepAndPrune.h b/cortex-9.7.0/include/IECore/SweepAndPrune.h similarity index 100% rename from cortex-9.6.0/include/IECore/SweepAndPrune.h rename to cortex-9.7.0/include/IECore/SweepAndPrune.h diff --git a/cortex-9.6.0/include/IECore/SweepAndPrune.inl b/cortex-9.7.0/include/IECore/SweepAndPrune.inl similarity index 100% rename from cortex-9.6.0/include/IECore/SweepAndPrune.inl rename to cortex-9.7.0/include/IECore/SweepAndPrune.inl diff --git a/cortex-9.6.0/include/IECore/TGAImageReader.h b/cortex-9.7.0/include/IECore/TGAImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/TGAImageReader.h rename to cortex-9.7.0/include/IECore/TGAImageReader.h diff --git a/cortex-9.6.0/include/IECore/TGAImageWriter.h b/cortex-9.7.0/include/IECore/TGAImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TGAImageWriter.h rename to cortex-9.7.0/include/IECore/TGAImageWriter.h diff --git a/cortex-9.6.0/include/IECore/TIFFImageReader.h b/cortex-9.7.0/include/IECore/TIFFImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECore/TIFFImageReader.h rename to cortex-9.7.0/include/IECore/TIFFImageReader.h diff --git a/cortex-9.6.0/include/IECore/TIFFImageWriter.h b/cortex-9.7.0/include/IECore/TIFFImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TIFFImageWriter.h rename to cortex-9.7.0/include/IECore/TIFFImageWriter.h diff --git a/cortex-9.6.0/include/IECore/TestTypedData.h b/cortex-9.7.0/include/IECore/TestTypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TestTypedData.h rename to cortex-9.7.0/include/IECore/TestTypedData.h diff --git a/cortex-9.6.0/include/IECore/TestTypedData.inl b/cortex-9.7.0/include/IECore/TestTypedData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TestTypedData.inl rename to cortex-9.7.0/include/IECore/TestTypedData.inl diff --git a/cortex-9.6.0/include/IECore/TetrahedronAlgo.h b/cortex-9.7.0/include/IECore/TetrahedronAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/TetrahedronAlgo.h rename to cortex-9.7.0/include/IECore/TetrahedronAlgo.h diff --git a/cortex-9.6.0/include/IECore/TetrahedronAlgo.inl b/cortex-9.7.0/include/IECore/TetrahedronAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TetrahedronAlgo.inl rename to cortex-9.7.0/include/IECore/TetrahedronAlgo.inl diff --git a/cortex-9.6.0/include/IECore/TimeCodeData.h b/cortex-9.7.0/include/IECore/TimeCodeData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimeCodeData.h rename to cortex-9.7.0/include/IECore/TimeCodeData.h diff --git a/cortex-9.6.0/include/IECore/TimeCodeParameter.h b/cortex-9.7.0/include/IECore/TimeCodeParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimeCodeParameter.h rename to cortex-9.7.0/include/IECore/TimeCodeParameter.h diff --git a/cortex-9.6.0/include/IECore/TimeDurationData.h b/cortex-9.7.0/include/IECore/TimeDurationData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimeDurationData.h rename to cortex-9.7.0/include/IECore/TimeDurationData.h diff --git a/cortex-9.6.0/include/IECore/TimeDurationParameter.h b/cortex-9.7.0/include/IECore/TimeDurationParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimeDurationParameter.h rename to cortex-9.7.0/include/IECore/TimeDurationParameter.h diff --git a/cortex-9.6.0/include/IECore/TimePeriod.h b/cortex-9.7.0/include/IECore/TimePeriod.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimePeriod.h rename to cortex-9.7.0/include/IECore/TimePeriod.h diff --git a/cortex-9.6.0/include/IECore/TimePeriodData.h b/cortex-9.7.0/include/IECore/TimePeriodData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimePeriodData.h rename to cortex-9.7.0/include/IECore/TimePeriodData.h diff --git a/cortex-9.6.0/include/IECore/TimePeriodParameter.h b/cortex-9.7.0/include/IECore/TimePeriodParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TimePeriodParameter.h rename to cortex-9.7.0/include/IECore/TimePeriodParameter.h diff --git a/cortex-9.6.0/include/IECore/Timer.h b/cortex-9.7.0/include/IECore/Timer.h similarity index 100% rename from cortex-9.6.0/include/IECore/Timer.h rename to cortex-9.7.0/include/IECore/Timer.h diff --git a/cortex-9.6.0/include/IECore/ToCoreConverter.h b/cortex-9.7.0/include/IECore/ToCoreConverter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ToCoreConverter.h rename to cortex-9.7.0/include/IECore/ToCoreConverter.h diff --git a/cortex-9.6.0/include/IECore/TransferSmoothSkinningWeightsOp.h b/cortex-9.7.0/include/IECore/TransferSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/TransferSmoothSkinningWeightsOp.h rename to cortex-9.7.0/include/IECore/TransferSmoothSkinningWeightsOp.h diff --git a/cortex-9.6.0/include/IECore/Transform.h b/cortex-9.7.0/include/IECore/Transform.h similarity index 100% rename from cortex-9.6.0/include/IECore/Transform.h rename to cortex-9.7.0/include/IECore/Transform.h diff --git a/cortex-9.6.0/include/IECore/TransformBlock.h b/cortex-9.7.0/include/IECore/TransformBlock.h similarity index 100% rename from cortex-9.6.0/include/IECore/TransformBlock.h rename to cortex-9.7.0/include/IECore/TransformBlock.h diff --git a/cortex-9.6.0/include/IECore/TransformOp.h b/cortex-9.7.0/include/IECore/TransformOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/TransformOp.h rename to cortex-9.7.0/include/IECore/TransformOp.h diff --git a/cortex-9.6.0/include/IECore/TransformationMatrix.h b/cortex-9.7.0/include/IECore/TransformationMatrix.h similarity index 100% rename from cortex-9.6.0/include/IECore/TransformationMatrix.h rename to cortex-9.7.0/include/IECore/TransformationMatrix.h diff --git a/cortex-9.6.0/include/IECore/TransformationMatrix.inl b/cortex-9.7.0/include/IECore/TransformationMatrix.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TransformationMatrix.inl rename to cortex-9.7.0/include/IECore/TransformationMatrix.inl diff --git a/cortex-9.6.0/include/IECore/TransformationMatrixData.h b/cortex-9.7.0/include/IECore/TransformationMatrixData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TransformationMatrixData.h rename to cortex-9.7.0/include/IECore/TransformationMatrixData.h diff --git a/cortex-9.6.0/include/IECore/TransformationMatrixInterpolator.inl b/cortex-9.7.0/include/IECore/TransformationMatrixInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TransformationMatrixInterpolator.inl rename to cortex-9.7.0/include/IECore/TransformationMatrixInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/TriangleAlgo.h b/cortex-9.7.0/include/IECore/TriangleAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/TriangleAlgo.h rename to cortex-9.7.0/include/IECore/TriangleAlgo.h diff --git a/cortex-9.6.0/include/IECore/TriangleAlgo.inl b/cortex-9.7.0/include/IECore/TriangleAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TriangleAlgo.inl rename to cortex-9.7.0/include/IECore/TriangleAlgo.inl diff --git a/cortex-9.6.0/include/IECore/TriangulateOp.h b/cortex-9.7.0/include/IECore/TriangulateOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/TriangulateOp.h rename to cortex-9.7.0/include/IECore/TriangulateOp.h diff --git a/cortex-9.6.0/include/IECore/Triangulator.h b/cortex-9.7.0/include/IECore/Triangulator.h similarity index 100% rename from cortex-9.6.0/include/IECore/Triangulator.h rename to cortex-9.7.0/include/IECore/Triangulator.h diff --git a/cortex-9.6.0/include/IECore/Triangulator.inl b/cortex-9.7.0/include/IECore/Triangulator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Triangulator.inl rename to cortex-9.7.0/include/IECore/Triangulator.inl diff --git a/cortex-9.6.0/include/IECore/Turbulence.h b/cortex-9.7.0/include/IECore/Turbulence.h similarity index 100% rename from cortex-9.6.0/include/IECore/Turbulence.h rename to cortex-9.7.0/include/IECore/Turbulence.h diff --git a/cortex-9.6.0/include/IECore/Turbulence.inl b/cortex-9.7.0/include/IECore/Turbulence.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Turbulence.inl rename to cortex-9.7.0/include/IECore/Turbulence.inl diff --git a/cortex-9.6.0/include/IECore/TypeIds.h b/cortex-9.7.0/include/IECore/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypeIds.h rename to cortex-9.7.0/include/IECore/TypeIds.h diff --git a/cortex-9.6.0/include/IECore/TypeTraits.h b/cortex-9.7.0/include/IECore/TypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypeTraits.h rename to cortex-9.7.0/include/IECore/TypeTraits.h diff --git a/cortex-9.6.0/include/IECore/TypedData.h b/cortex-9.7.0/include/IECore/TypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedData.h rename to cortex-9.7.0/include/IECore/TypedData.h diff --git a/cortex-9.6.0/include/IECore/TypedData.inl b/cortex-9.7.0/include/IECore/TypedData.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TypedData.inl rename to cortex-9.7.0/include/IECore/TypedData.inl diff --git a/cortex-9.6.0/include/IECore/TypedDataInternals.h b/cortex-9.7.0/include/IECore/TypedDataInternals.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedDataInternals.h rename to cortex-9.7.0/include/IECore/TypedDataInternals.h diff --git a/cortex-9.6.0/include/IECore/TypedDataInterpolator.inl b/cortex-9.7.0/include/IECore/TypedDataInterpolator.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TypedDataInterpolator.inl rename to cortex-9.7.0/include/IECore/TypedDataInterpolator.inl diff --git a/cortex-9.6.0/include/IECore/TypedObjectParameter.h b/cortex-9.7.0/include/IECore/TypedObjectParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedObjectParameter.h rename to cortex-9.7.0/include/IECore/TypedObjectParameter.h diff --git a/cortex-9.6.0/include/IECore/TypedObjectParameter.inl b/cortex-9.7.0/include/IECore/TypedObjectParameter.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TypedObjectParameter.inl rename to cortex-9.7.0/include/IECore/TypedObjectParameter.inl diff --git a/cortex-9.6.0/include/IECore/TypedParameter.h b/cortex-9.7.0/include/IECore/TypedParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedParameter.h rename to cortex-9.7.0/include/IECore/TypedParameter.h diff --git a/cortex-9.6.0/include/IECore/TypedParameter.inl b/cortex-9.7.0/include/IECore/TypedParameter.inl similarity index 100% rename from cortex-9.6.0/include/IECore/TypedParameter.inl rename to cortex-9.7.0/include/IECore/TypedParameter.inl diff --git a/cortex-9.6.0/include/IECore/TypedParameterInternals.h b/cortex-9.7.0/include/IECore/TypedParameterInternals.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedParameterInternals.h rename to cortex-9.7.0/include/IECore/TypedParameterInternals.h diff --git a/cortex-9.6.0/include/IECore/TypedPrimitiveOp.h b/cortex-9.7.0/include/IECore/TypedPrimitiveOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedPrimitiveOp.h rename to cortex-9.7.0/include/IECore/TypedPrimitiveOp.h diff --git a/cortex-9.6.0/include/IECore/TypedPrimitiveParameter.h b/cortex-9.7.0/include/IECore/TypedPrimitiveParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/TypedPrimitiveParameter.h rename to cortex-9.7.0/include/IECore/TypedPrimitiveParameter.h diff --git a/cortex-9.6.0/include/IECore/UVDistortOp.h b/cortex-9.7.0/include/IECore/UVDistortOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/UVDistortOp.h rename to cortex-9.7.0/include/IECore/UVDistortOp.h diff --git a/cortex-9.6.0/include/IECore/ValidatedStringParameter.h b/cortex-9.7.0/include/IECore/ValidatedStringParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/ValidatedStringParameter.h rename to cortex-9.7.0/include/IECore/ValidatedStringParameter.h diff --git a/cortex-9.6.0/include/IECore/VecAlgo.h b/cortex-9.7.0/include/IECore/VecAlgo.h similarity index 100% rename from cortex-9.6.0/include/IECore/VecAlgo.h rename to cortex-9.7.0/include/IECore/VecAlgo.h diff --git a/cortex-9.6.0/include/IECore/VecAlgo.inl b/cortex-9.7.0/include/IECore/VecAlgo.inl similarity index 100% rename from cortex-9.6.0/include/IECore/VecAlgo.inl rename to cortex-9.7.0/include/IECore/VecAlgo.inl diff --git a/cortex-9.6.0/include/IECore/VectorDataFilterOp.h b/cortex-9.7.0/include/IECore/VectorDataFilterOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/VectorDataFilterOp.h rename to cortex-9.7.0/include/IECore/VectorDataFilterOp.h diff --git a/cortex-9.6.0/include/IECore/VectorOps.h b/cortex-9.7.0/include/IECore/VectorOps.h similarity index 100% rename from cortex-9.6.0/include/IECore/VectorOps.h rename to cortex-9.7.0/include/IECore/VectorOps.h diff --git a/cortex-9.6.0/include/IECore/VectorOps.inl b/cortex-9.7.0/include/IECore/VectorOps.inl similarity index 100% rename from cortex-9.6.0/include/IECore/VectorOps.inl rename to cortex-9.7.0/include/IECore/VectorOps.inl diff --git a/cortex-9.6.0/include/IECore/VectorTraits.h b/cortex-9.7.0/include/IECore/VectorTraits.h similarity index 100% rename from cortex-9.6.0/include/IECore/VectorTraits.h rename to cortex-9.7.0/include/IECore/VectorTraits.h diff --git a/cortex-9.6.0/include/IECore/VectorTypedData.h b/cortex-9.7.0/include/IECore/VectorTypedData.h similarity index 100% rename from cortex-9.6.0/include/IECore/VectorTypedData.h rename to cortex-9.7.0/include/IECore/VectorTypedData.h diff --git a/cortex-9.6.0/include/IECore/VectorTypedParameter.h b/cortex-9.7.0/include/IECore/VectorTypedParameter.h similarity index 100% rename from cortex-9.6.0/include/IECore/VectorTypedParameter.h rename to cortex-9.7.0/include/IECore/VectorTypedParameter.h diff --git a/cortex-9.6.0/include/IECore/VisibleRenderable.h b/cortex-9.7.0/include/IECore/VisibleRenderable.h similarity index 100% rename from cortex-9.6.0/include/IECore/VisibleRenderable.h rename to cortex-9.7.0/include/IECore/VisibleRenderable.h diff --git a/cortex-9.6.0/include/IECore/WarpOp.h b/cortex-9.7.0/include/IECore/WarpOp.h similarity index 100% rename from cortex-9.6.0/include/IECore/WarpOp.h rename to cortex-9.7.0/include/IECore/WarpOp.h diff --git a/cortex-9.6.0/include/IECore/WorldBlock.h b/cortex-9.7.0/include/IECore/WorldBlock.h similarity index 100% rename from cortex-9.6.0/include/IECore/WorldBlock.h rename to cortex-9.7.0/include/IECore/WorldBlock.h diff --git a/cortex-9.6.0/include/IECore/Writer.h b/cortex-9.7.0/include/IECore/Writer.h similarity index 100% rename from cortex-9.6.0/include/IECore/Writer.h rename to cortex-9.7.0/include/IECore/Writer.h diff --git a/cortex-9.6.0/include/IECore/Writer.inl b/cortex-9.7.0/include/IECore/Writer.inl similarity index 100% rename from cortex-9.6.0/include/IECore/Writer.inl rename to cortex-9.7.0/include/IECore/Writer.inl diff --git a/cortex-9.6.0/include/IECore/XYYToXYZColorTransform.h b/cortex-9.7.0/include/IECore/XYYToXYZColorTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/XYYToXYZColorTransform.h rename to cortex-9.7.0/include/IECore/XYYToXYZColorTransform.h diff --git a/cortex-9.6.0/include/IECore/XYYToXYZColorTransform.inl b/cortex-9.7.0/include/IECore/XYYToXYZColorTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/XYYToXYZColorTransform.inl rename to cortex-9.7.0/include/IECore/XYYToXYZColorTransform.inl diff --git a/cortex-9.6.0/include/IECore/XYZToRGBColorTransform.h b/cortex-9.7.0/include/IECore/XYZToRGBColorTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/XYZToRGBColorTransform.h rename to cortex-9.7.0/include/IECore/XYZToRGBColorTransform.h diff --git a/cortex-9.6.0/include/IECore/XYZToRGBColorTransform.inl b/cortex-9.7.0/include/IECore/XYZToRGBColorTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/XYZToRGBColorTransform.inl rename to cortex-9.7.0/include/IECore/XYZToRGBColorTransform.inl diff --git a/cortex-9.6.0/include/IECore/XYZToXYYColorTransform.h b/cortex-9.7.0/include/IECore/XYZToXYYColorTransform.h similarity index 100% rename from cortex-9.6.0/include/IECore/XYZToXYYColorTransform.h rename to cortex-9.7.0/include/IECore/XYZToXYYColorTransform.h diff --git a/cortex-9.6.0/include/IECore/XYZToXYYColorTransform.inl b/cortex-9.7.0/include/IECore/XYZToXYYColorTransform.inl similarity index 100% rename from cortex-9.6.0/include/IECore/XYZToXYYColorTransform.inl rename to cortex-9.7.0/include/IECore/XYZToXYYColorTransform.inl diff --git a/cortex-9.6.0/include/IECore/YUVImageWriter.h b/cortex-9.7.0/include/IECore/YUVImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECore/YUVImageWriter.h rename to cortex-9.7.0/include/IECore/YUVImageWriter.h diff --git a/cortex-9.6.0/include/IECore/private/DisplayDriverServerHeader.h b/cortex-9.7.0/include/IECore/private/DisplayDriverServerHeader.h similarity index 100% rename from cortex-9.6.0/include/IECore/private/DisplayDriverServerHeader.h rename to cortex-9.7.0/include/IECore/private/DisplayDriverServerHeader.h diff --git a/cortex-9.6.0/include/IECore/private/ScopedTIFFErrorHandler.h b/cortex-9.7.0/include/IECore/private/ScopedTIFFErrorHandler.h similarity index 100% rename from cortex-9.6.0/include/IECore/private/ScopedTIFFErrorHandler.h rename to cortex-9.7.0/include/IECore/private/ScopedTIFFErrorHandler.h diff --git a/cortex-9.6.0/include/IECoreRI/private/TransformStack.h b/cortex-9.7.0/include/IECore/private/TransformStack.h similarity index 89% rename from cortex-9.6.0/include/IECoreRI/private/TransformStack.h rename to cortex-9.7.0/include/IECore/private/TransformStack.h index ee13886c4d..4fcc3ecc2b 100644 --- a/cortex-9.6.0/include/IECoreRI/private/TransformStack.h +++ b/cortex-9.7.0/include/IECore/private/TransformStack.h @@ -32,57 +32,59 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORERI_TRANSFORMSTACK_H -#define IECORERI_TRANSFORMSTACK_H +#ifndef IECORE_TRANSFORMSTACK_H +#define IECORE_TRANSFORMSTACK_H #include #include #include "OpenEXR/ImathMatrix.h" -#include "IECoreRI/Export.h" +#include "IECore/Export.h" -namespace IECoreRI +namespace IECore { - -class IECORERI_API TransformStack + +class IECORE_API TransformStack { public : - + TransformStack(); - + TransformStack( const TransformStack &other, bool flatten = false ); + void push(); void pop(); size_t size() const; - + void motionBegin( const std::vector × ); void motionEnd(); - + bool inMotion() const; + void set( const Imath::M44f &matrix ); void concatenate( const Imath::M44f &matrix ); Imath::M44f get() const; Imath::M44f get( float time ) const; - + size_t numSamples() const; Imath::M44f sample( size_t sampleIndex ) const; float sampleTime( size_t sampleIndex ) const; - + private : - + struct Sample { Sample( float t, const Imath::M44f &m ) : time( t ), matrix( m ) { } - + bool operator < ( float t ) const { return time < t; } - + float time; Imath::M44f matrix; }; @@ -94,6 +96,6 @@ class IECORERI_API TransformStack }; -} // namespace IECoreRI +} // namespace IECore -#endif // IECORERI_TRANSFORMSTACK_H +#endif // IECORE_TRANSFORMSTACK_H diff --git a/cortex-9.6.0/include/IECore/private/cineon.h b/cortex-9.7.0/include/IECore/private/cineon.h similarity index 100% rename from cortex-9.6.0/include/IECore/private/cineon.h rename to cortex-9.7.0/include/IECore/private/cineon.h diff --git a/cortex-9.6.0/include/IECore/private/dpx.h b/cortex-9.7.0/include/IECore/private/dpx.h similarity index 100% rename from cortex-9.6.0/include/IECore/private/dpx.h rename to cortex-9.7.0/include/IECore/private/dpx.h diff --git a/cortex-9.6.0/include/IECoreGL/AlphaTexture.h b/cortex-9.7.0/include/IECoreGL/AlphaTexture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/AlphaTexture.h rename to cortex-9.7.0/include/IECoreGL/AlphaTexture.h diff --git a/cortex-9.6.0/include/IECoreGL/Bindable.h b/cortex-9.7.0/include/IECoreGL/Bindable.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Bindable.h rename to cortex-9.7.0/include/IECoreGL/Bindable.h diff --git a/cortex-9.6.0/include/IECoreGL/BoxPrimitive.h b/cortex-9.7.0/include/IECoreGL/BoxPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/BoxPrimitive.h rename to cortex-9.7.0/include/IECoreGL/BoxPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Buffer.h b/cortex-9.7.0/include/IECoreGL/Buffer.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Buffer.h rename to cortex-9.7.0/include/IECoreGL/Buffer.h diff --git a/cortex-9.6.0/include/IECoreGL/CachedConverter.h b/cortex-9.7.0/include/IECoreGL/CachedConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/CachedConverter.h rename to cortex-9.7.0/include/IECoreGL/CachedConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/Camera.h b/cortex-9.7.0/include/IECoreGL/Camera.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Camera.h rename to cortex-9.7.0/include/IECoreGL/Camera.h diff --git a/cortex-9.6.0/include/IECoreGL/ColorTexture.h b/cortex-9.7.0/include/IECoreGL/ColorTexture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ColorTexture.h rename to cortex-9.7.0/include/IECoreGL/ColorTexture.h diff --git a/cortex-9.6.0/include/IECoreGL/CurvesPrimitive.h b/cortex-9.7.0/include/IECoreGL/CurvesPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/CurvesPrimitive.h rename to cortex-9.7.0/include/IECoreGL/CurvesPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Debug.h b/cortex-9.7.0/include/IECoreGL/Debug.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Debug.h rename to cortex-9.7.0/include/IECoreGL/Debug.h diff --git a/cortex-9.6.0/include/IECoreGL/DepthTexture.h b/cortex-9.7.0/include/IECoreGL/DepthTexture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/DepthTexture.h rename to cortex-9.7.0/include/IECoreGL/DepthTexture.h diff --git a/cortex-9.6.0/include/IECoreGL/DiskPrimitive.h b/cortex-9.7.0/include/IECoreGL/DiskPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/DiskPrimitive.h rename to cortex-9.7.0/include/IECoreGL/DiskPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Exception.h b/cortex-9.7.0/include/IECoreGL/Exception.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Exception.h rename to cortex-9.7.0/include/IECoreGL/Exception.h diff --git a/cortex-9.6.0/include/IECoreGL/Export.h b/cortex-9.7.0/include/IECoreGL/Export.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Export.h rename to cortex-9.7.0/include/IECoreGL/Export.h diff --git a/cortex-9.6.0/include/IECoreGL/Font.h b/cortex-9.7.0/include/IECoreGL/Font.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Font.h rename to cortex-9.7.0/include/IECoreGL/Font.h diff --git a/cortex-9.6.0/include/IECoreGL/FontLoader.h b/cortex-9.7.0/include/IECoreGL/FontLoader.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/FontLoader.h rename to cortex-9.7.0/include/IECoreGL/FontLoader.h diff --git a/cortex-9.6.0/include/IECoreGL/FrameBuffer.h b/cortex-9.7.0/include/IECoreGL/FrameBuffer.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/FrameBuffer.h rename to cortex-9.7.0/include/IECoreGL/FrameBuffer.h diff --git a/cortex-9.6.0/include/IECoreGL/GL.h b/cortex-9.7.0/include/IECoreGL/GL.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/GL.h rename to cortex-9.7.0/include/IECoreGL/GL.h diff --git a/cortex-9.6.0/include/IECoreGL/GL.inl b/cortex-9.7.0/include/IECoreGL/GL.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/GL.inl rename to cortex-9.7.0/include/IECoreGL/GL.inl diff --git a/cortex-9.6.0/include/IECoreGL/Group.h b/cortex-9.7.0/include/IECoreGL/Group.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Group.h rename to cortex-9.7.0/include/IECoreGL/Group.h diff --git a/cortex-9.6.0/include/IECoreGL/HitRecord.h b/cortex-9.7.0/include/IECoreGL/HitRecord.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/HitRecord.h rename to cortex-9.7.0/include/IECoreGL/HitRecord.h diff --git a/cortex-9.6.0/include/IECoreGL/IECoreGL.h b/cortex-9.7.0/include/IECoreGL/IECoreGL.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/IECoreGL.h rename to cortex-9.7.0/include/IECoreGL/IECoreGL.h diff --git a/cortex-9.6.0/include/IECoreGL/LuminanceTexture.h b/cortex-9.7.0/include/IECoreGL/LuminanceTexture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/LuminanceTexture.h rename to cortex-9.7.0/include/IECoreGL/LuminanceTexture.h diff --git a/cortex-9.6.0/include/IECoreGL/MeshPrimitive.h b/cortex-9.7.0/include/IECoreGL/MeshPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/MeshPrimitive.h rename to cortex-9.7.0/include/IECoreGL/MeshPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/NameStateComponent.h b/cortex-9.7.0/include/IECoreGL/NameStateComponent.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/NameStateComponent.h rename to cortex-9.7.0/include/IECoreGL/NameStateComponent.h diff --git a/cortex-9.6.0/include/IECoreGL/NumericTraits.h b/cortex-9.7.0/include/IECoreGL/NumericTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/NumericTraits.h rename to cortex-9.7.0/include/IECoreGL/NumericTraits.h diff --git a/cortex-9.6.0/include/IECoreGL/OrthographicCamera.h b/cortex-9.7.0/include/IECoreGL/OrthographicCamera.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/OrthographicCamera.h rename to cortex-9.7.0/include/IECoreGL/OrthographicCamera.h diff --git a/cortex-9.6.0/include/IECoreGL/PerspectiveCamera.h b/cortex-9.7.0/include/IECoreGL/PerspectiveCamera.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/PerspectiveCamera.h rename to cortex-9.7.0/include/IECoreGL/PerspectiveCamera.h diff --git a/cortex-9.6.0/include/IECoreGL/PointsPrimitive.h b/cortex-9.7.0/include/IECoreGL/PointsPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/PointsPrimitive.h rename to cortex-9.7.0/include/IECoreGL/PointsPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Primitive.h b/cortex-9.7.0/include/IECoreGL/Primitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Primitive.h rename to cortex-9.7.0/include/IECoreGL/Primitive.h diff --git a/cortex-9.6.0/include/IECoreGL/QuadPrimitive.h b/cortex-9.7.0/include/IECoreGL/QuadPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/QuadPrimitive.h rename to cortex-9.7.0/include/IECoreGL/QuadPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Renderable.h b/cortex-9.7.0/include/IECoreGL/Renderable.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Renderable.h rename to cortex-9.7.0/include/IECoreGL/Renderable.h diff --git a/cortex-9.6.0/include/IECoreGL/Renderer.h b/cortex-9.7.0/include/IECoreGL/Renderer.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Renderer.h rename to cortex-9.7.0/include/IECoreGL/Renderer.h diff --git a/cortex-9.6.0/include/IECoreGL/Scene.h b/cortex-9.7.0/include/IECoreGL/Scene.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Scene.h rename to cortex-9.7.0/include/IECoreGL/Scene.h diff --git a/cortex-9.6.0/include/IECoreGL/Selector.h b/cortex-9.7.0/include/IECoreGL/Selector.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Selector.h rename to cortex-9.7.0/include/IECoreGL/Selector.h diff --git a/cortex-9.6.0/include/IECoreGL/Shader.h b/cortex-9.7.0/include/IECoreGL/Shader.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Shader.h rename to cortex-9.7.0/include/IECoreGL/Shader.h diff --git a/cortex-9.6.0/include/IECoreGL/ShaderLoader.h b/cortex-9.7.0/include/IECoreGL/ShaderLoader.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ShaderLoader.h rename to cortex-9.7.0/include/IECoreGL/ShaderLoader.h diff --git a/cortex-9.6.0/include/IECoreGL/ShaderStateComponent.h b/cortex-9.7.0/include/IECoreGL/ShaderStateComponent.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ShaderStateComponent.h rename to cortex-9.7.0/include/IECoreGL/ShaderStateComponent.h diff --git a/cortex-9.6.0/include/IECoreGL/SpherePrimitive.h b/cortex-9.7.0/include/IECoreGL/SpherePrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/SpherePrimitive.h rename to cortex-9.7.0/include/IECoreGL/SpherePrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/SplineToGLTextureConverter.h b/cortex-9.7.0/include/IECoreGL/SplineToGLTextureConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/SplineToGLTextureConverter.h rename to cortex-9.7.0/include/IECoreGL/SplineToGLTextureConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/State.h b/cortex-9.7.0/include/IECoreGL/State.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/State.h rename to cortex-9.7.0/include/IECoreGL/State.h diff --git a/cortex-9.6.0/include/IECoreGL/State.inl b/cortex-9.7.0/include/IECoreGL/State.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/State.inl rename to cortex-9.7.0/include/IECoreGL/State.inl diff --git a/cortex-9.6.0/include/IECoreGL/StateComponent.h b/cortex-9.7.0/include/IECoreGL/StateComponent.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/StateComponent.h rename to cortex-9.7.0/include/IECoreGL/StateComponent.h diff --git a/cortex-9.6.0/include/IECoreGL/StateComponent.inl b/cortex-9.7.0/include/IECoreGL/StateComponent.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/StateComponent.inl rename to cortex-9.7.0/include/IECoreGL/StateComponent.inl diff --git a/cortex-9.6.0/include/IECoreGL/TextPrimitive.h b/cortex-9.7.0/include/IECoreGL/TextPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/TextPrimitive.h rename to cortex-9.7.0/include/IECoreGL/TextPrimitive.h diff --git a/cortex-9.6.0/include/IECoreGL/Texture.h b/cortex-9.7.0/include/IECoreGL/Texture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/Texture.h rename to cortex-9.7.0/include/IECoreGL/Texture.h diff --git a/cortex-9.6.0/include/IECoreGL/TextureLoader.h b/cortex-9.7.0/include/IECoreGL/TextureLoader.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/TextureLoader.h rename to cortex-9.7.0/include/IECoreGL/TextureLoader.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLBufferConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLBufferConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLBufferConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLBufferConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLCameraConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLCameraConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLCameraConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLCameraConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLConverter.inl b/cortex-9.7.0/include/IECoreGL/ToGLConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLConverter.inl rename to cortex-9.7.0/include/IECoreGL/ToGLConverter.inl diff --git a/cortex-9.6.0/include/IECoreGL/ToGLCurvesConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLCurvesConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLCurvesConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLCurvesConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLMeshConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLMeshConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLMeshConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLMeshConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLPointsConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLPointsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLPointsConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLPointsConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLSphereConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLSphereConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLSphereConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLSphereConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLStateConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLStateConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLStateConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLStateConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/ToGLTextureConverter.h b/cortex-9.7.0/include/IECoreGL/ToGLTextureConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/ToGLTextureConverter.h rename to cortex-9.7.0/include/IECoreGL/ToGLTextureConverter.h diff --git a/cortex-9.6.0/include/IECoreGL/TypeIds.h b/cortex-9.7.0/include/IECoreGL/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/TypeIds.h rename to cortex-9.7.0/include/IECoreGL/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreGL/TypedStateComponent.h b/cortex-9.7.0/include/IECoreGL/TypedStateComponent.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/TypedStateComponent.h rename to cortex-9.7.0/include/IECoreGL/TypedStateComponent.h diff --git a/cortex-9.6.0/include/IECoreGL/TypedStateComponent.inl b/cortex-9.7.0/include/IECoreGL/TypedStateComponent.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/TypedStateComponent.inl rename to cortex-9.7.0/include/IECoreGL/TypedStateComponent.inl diff --git a/cortex-9.6.0/include/IECoreGL/UIntTexture.h b/cortex-9.7.0/include/IECoreGL/UIntTexture.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/UIntTexture.h rename to cortex-9.7.0/include/IECoreGL/UIntTexture.h diff --git a/cortex-9.6.0/include/IECoreGL/UniformFunctions.h b/cortex-9.7.0/include/IECoreGL/UniformFunctions.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/UniformFunctions.h rename to cortex-9.7.0/include/IECoreGL/UniformFunctions.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/AlphaTextureBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/AlphaTextureBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/AlphaTextureBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/AlphaTextureBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/BindableBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/BindableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/BindableBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/BindableBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/BufferBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/BufferBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/BufferBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/BufferBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/CachedConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/CachedConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/CachedConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/CachedConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/CameraBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/CameraBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/CameraBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/CameraBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ColorTextureBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ColorTextureBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ColorTextureBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ColorTextureBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/CurvesPrimitiveBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/CurvesPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/CurvesPrimitiveBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/CurvesPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/DepthTextureBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/DepthTextureBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/DepthTextureBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/DepthTextureBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/FontBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/FontBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/FontBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/FontBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/FontLoaderBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/FontLoaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/FontLoaderBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/FontLoaderBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/FrameBufferBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/FrameBufferBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/FrameBufferBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/FrameBufferBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/GroupBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/GroupBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/GroupBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/GroupBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/HitRecordBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/HitRecordBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/HitRecordBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/HitRecordBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/LuminanceTextureBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/LuminanceTextureBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/LuminanceTextureBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/LuminanceTextureBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/MeshPrimitiveBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/MeshPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/MeshPrimitiveBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/MeshPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/NameStateComponentBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/NameStateComponentBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/NameStateComponentBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/NameStateComponentBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/OrthographicCameraBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/OrthographicCameraBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/OrthographicCameraBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/OrthographicCameraBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/PerspectiveCameraBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/PerspectiveCameraBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/PerspectiveCameraBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/PerspectiveCameraBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/PointsPrimitiveBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/PointsPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/PointsPrimitiveBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/PointsPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/PrimitiveBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/PrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/PrimitiveBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/PrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/RenderableBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/RenderableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/RenderableBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/RenderableBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/RendererBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/RendererBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/RendererBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/RendererBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/SceneBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/SceneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/SceneBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/SceneBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/SelectorBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/SelectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/SelectorBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/SelectorBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ShaderBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ShaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ShaderBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ShaderBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ShaderLoaderBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ShaderLoaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ShaderLoaderBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ShaderLoaderBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ShaderStateComponentBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ShaderStateComponentBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ShaderStateComponentBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ShaderStateComponentBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/StateBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/StateBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/StateBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/StateBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/StateComponentBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/StateComponentBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/StateComponentBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/StateComponentBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/TextureBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/TextureBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/TextureBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/TextureBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/TextureLoaderBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/TextureLoaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/TextureLoaderBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/TextureLoaderBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLCameraConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLCameraConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLCameraConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLCameraConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLMeshConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLMeshConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLMeshConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLMeshConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLPointsConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLPointsConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLPointsConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLPointsConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLStateConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLStateConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLStateConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLStateConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/ToGLTextureConverterBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/ToGLTextureConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/ToGLTextureConverterBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/ToGLTextureConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/TypedStateComponentBinding.h b/cortex-9.7.0/include/IECoreGL/bindings/TypedStateComponentBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/TypedStateComponentBinding.h rename to cortex-9.7.0/include/IECoreGL/bindings/TypedStateComponentBinding.h diff --git a/cortex-9.6.0/include/IECoreGL/bindings/TypedStateComponentBinding.inl b/cortex-9.7.0/include/IECoreGL/bindings/TypedStateComponentBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/bindings/TypedStateComponentBinding.inl rename to cortex-9.7.0/include/IECoreGL/bindings/TypedStateComponentBinding.inl diff --git a/cortex-9.6.0/include/IECoreGL/private/DeferredRendererImplementation.h b/cortex-9.7.0/include/IECoreGL/private/DeferredRendererImplementation.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/private/DeferredRendererImplementation.h rename to cortex-9.7.0/include/IECoreGL/private/DeferredRendererImplementation.h diff --git a/cortex-9.6.0/include/IECoreGL/private/Display.h b/cortex-9.7.0/include/IECoreGL/private/Display.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/private/Display.h rename to cortex-9.7.0/include/IECoreGL/private/Display.h diff --git a/cortex-9.6.0/include/IECoreGL/private/ImmediateRendererImplementation.h b/cortex-9.7.0/include/IECoreGL/private/ImmediateRendererImplementation.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/private/ImmediateRendererImplementation.h rename to cortex-9.7.0/include/IECoreGL/private/ImmediateRendererImplementation.h diff --git a/cortex-9.6.0/include/IECoreGL/private/RendererImplementation.h b/cortex-9.7.0/include/IECoreGL/private/RendererImplementation.h similarity index 100% rename from cortex-9.6.0/include/IECoreGL/private/RendererImplementation.h rename to cortex-9.7.0/include/IECoreGL/private/RendererImplementation.h diff --git a/cortex-9.6.0/include/IECoreGL/private/RendererImplementation.inl b/cortex-9.7.0/include/IECoreGL/private/RendererImplementation.inl similarity index 100% rename from cortex-9.6.0/include/IECoreGL/private/RendererImplementation.inl rename to cortex-9.7.0/include/IECoreGL/private/RendererImplementation.inl diff --git a/cortex-9.6.0/include/IECoreHoudini/Convert.h b/cortex-9.7.0/include/IECoreHoudini/Convert.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/Convert.h rename to cortex-9.7.0/include/IECoreHoudini/Convert.h diff --git a/cortex-9.6.0/include/IECoreHoudini/CoreHoudini.h b/cortex-9.7.0/include/IECoreHoudini/CoreHoudini.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/CoreHoudini.h rename to cortex-9.7.0/include/IECoreHoudini/CoreHoudini.h diff --git a/cortex-9.6.0/include/IECoreHoudini/DetailSplitter.h b/cortex-9.7.0/include/IECoreHoudini/DetailSplitter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/DetailSplitter.h rename to cortex-9.7.0/include/IECoreHoudini/DetailSplitter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FnParameterisedHolder.h b/cortex-9.7.0/include/IECoreHoudini/FnParameterisedHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FnParameterisedHolder.h rename to cortex-9.7.0/include/IECoreHoudini/FnParameterisedHolder.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniCurvesConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniCurvesConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniCurvesConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniCurvesConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniGeometryConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniGeometryConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniGeometryConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniGeometryConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniGeometryConverter.inl b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniGeometryConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniGeometryConverter.inl rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniGeometryConverter.inl diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniGroupConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniGroupConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniGroupConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniGroupConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniPointsConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniPointsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniPointsConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniPointsConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/FromHoudiniPolygonsConverter.h b/cortex-9.7.0/include/IECoreHoudini/FromHoudiniPolygonsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/FromHoudiniPolygonsConverter.h rename to cortex-9.7.0/include/IECoreHoudini/FromHoudiniPolygonsConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GEO_CobIOTranslator.h b/cortex-9.7.0/include/IECoreHoudini/GEO_CobIOTranslator.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GEO_CobIOTranslator.h rename to cortex-9.7.0/include/IECoreHoudini/GEO_CobIOTranslator.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GEO_CortexPrimitive.h b/cortex-9.7.0/include/IECoreHoudini/GEO_CortexPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GEO_CortexPrimitive.h rename to cortex-9.7.0/include/IECoreHoudini/GEO_CortexPrimitive.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GR_Cortex.h b/cortex-9.7.0/include/IECoreHoudini/GR_Cortex.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GR_Cortex.h rename to cortex-9.7.0/include/IECoreHoudini/GR_Cortex.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GR_CortexPrimitive.h b/cortex-9.7.0/include/IECoreHoudini/GR_CortexPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GR_CortexPrimitive.h rename to cortex-9.7.0/include/IECoreHoudini/GR_CortexPrimitive.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GUI_CortexPrimitiveHook.h b/cortex-9.7.0/include/IECoreHoudini/GUI_CortexPrimitiveHook.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GUI_CortexPrimitiveHook.h rename to cortex-9.7.0/include/IECoreHoudini/GUI_CortexPrimitiveHook.h diff --git a/cortex-9.6.0/include/IECoreHoudini/GU_CortexPrimitive.h b/cortex-9.7.0/include/IECoreHoudini/GU_CortexPrimitive.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/GU_CortexPrimitive.h rename to cortex-9.7.0/include/IECoreHoudini/GU_CortexPrimitive.h diff --git a/cortex-9.6.0/include/IECoreHoudini/LiveScene.h b/cortex-9.7.0/include/IECoreHoudini/LiveScene.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/LiveScene.h rename to cortex-9.7.0/include/IECoreHoudini/LiveScene.h diff --git a/cortex-9.6.0/include/IECoreHoudini/MessageHandler.h b/cortex-9.7.0/include/IECoreHoudini/MessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/MessageHandler.h rename to cortex-9.7.0/include/IECoreHoudini/MessageHandler.h diff --git a/cortex-9.6.0/include/IECoreHoudini/NodeHandle.h b/cortex-9.7.0/include/IECoreHoudini/NodeHandle.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/NodeHandle.h rename to cortex-9.7.0/include/IECoreHoudini/NodeHandle.h diff --git a/cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheGeometry.h b/cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheGeometry.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheGeometry.h rename to cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheGeometry.h diff --git a/cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheNode.h b/cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheNode.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheNode.h rename to cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheNode.h diff --git a/cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheTransform.h b/cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheTransform.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/OBJ_SceneCacheTransform.h rename to cortex-9.7.0/include/IECoreHoudini/OBJ_SceneCacheTransform.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ParameterisedHolder.h b/cortex-9.7.0/include/IECoreHoudini/ParameterisedHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ParameterisedHolder.h rename to cortex-9.7.0/include/IECoreHoudini/ParameterisedHolder.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ParameterisedHolderInterface.h b/cortex-9.7.0/include/IECoreHoudini/ParameterisedHolderInterface.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ParameterisedHolderInterface.h rename to cortex-9.7.0/include/IECoreHoudini/ParameterisedHolderInterface.h diff --git a/cortex-9.6.0/include/IECoreHoudini/RATDeepImageReader.h b/cortex-9.7.0/include/IECoreHoudini/RATDeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/RATDeepImageReader.h rename to cortex-9.7.0/include/IECoreHoudini/RATDeepImageReader.h diff --git a/cortex-9.6.0/include/IECoreHoudini/RATDeepImageWriter.h b/cortex-9.7.0/include/IECoreHoudini/RATDeepImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/RATDeepImageWriter.h rename to cortex-9.7.0/include/IECoreHoudini/RATDeepImageWriter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ROP_SceneCacheWriter.h b/cortex-9.7.0/include/IECoreHoudini/ROP_SceneCacheWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ROP_SceneCacheWriter.h rename to cortex-9.7.0/include/IECoreHoudini/ROP_SceneCacheWriter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_CortexConverter.h b/cortex-9.7.0/include/IECoreHoudini/SOP_CortexConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_CortexConverter.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_CortexConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_OpHolder.h b/cortex-9.7.0/include/IECoreHoudini/SOP_OpHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_OpHolder.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_OpHolder.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_ParameterisedHolder.h b/cortex-9.7.0/include/IECoreHoudini/SOP_ParameterisedHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_ParameterisedHolder.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_ParameterisedHolder.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_ProceduralHolder.h b/cortex-9.7.0/include/IECoreHoudini/SOP_ProceduralHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_ProceduralHolder.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_ProceduralHolder.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_SceneCacheSource.h b/cortex-9.7.0/include/IECoreHoudini/SOP_SceneCacheSource.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_SceneCacheSource.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_SceneCacheSource.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SOP_SceneCacheTransform.h b/cortex-9.7.0/include/IECoreHoudini/SOP_SceneCacheTransform.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SOP_SceneCacheTransform.h rename to cortex-9.7.0/include/IECoreHoudini/SOP_SceneCacheTransform.h diff --git a/cortex-9.6.0/include/IECoreHoudini/SceneCacheNode.h b/cortex-9.7.0/include/IECoreHoudini/SceneCacheNode.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/SceneCacheNode.h rename to cortex-9.7.0/include/IECoreHoudini/SceneCacheNode.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniAttribConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniAttribConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniAttribConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniAttribConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniAttribConverter.inl b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniAttribConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniAttribConverter.inl rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniAttribConverter.inl diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniCurvesConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniCurvesConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniCurvesConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniCurvesConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniGeometryConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniGeometryConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniGeometryConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniGeometryConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniGeometryConverter.inl b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniGeometryConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniGeometryConverter.inl rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniGeometryConverter.inl diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniGroupConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniGroupConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniGroupConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniGroupConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniPointsConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniPointsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniPointsConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniPointsConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniPolygonsConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniPolygonsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniPolygonsConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniPolygonsConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniQuatAttribConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniQuatAttribConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniQuatAttribConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniQuatAttribConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/ToHoudiniStringAttribConverter.h b/cortex-9.7.0/include/IECoreHoudini/ToHoudiniStringAttribConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/ToHoudiniStringAttribConverter.h rename to cortex-9.7.0/include/IECoreHoudini/ToHoudiniStringAttribConverter.h diff --git a/cortex-9.6.0/include/IECoreHoudini/TypeIds.h b/cortex-9.7.0/include/IECoreHoudini/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/TypeIds.h rename to cortex-9.7.0/include/IECoreHoudini/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreHoudini/TypeTraits.h b/cortex-9.7.0/include/IECoreHoudini/TypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/TypeTraits.h rename to cortex-9.7.0/include/IECoreHoudini/TypeTraits.h diff --git a/cortex-9.6.0/include/IECoreHoudini/UT_ObjectPoolCache.h b/cortex-9.7.0/include/IECoreHoudini/UT_ObjectPoolCache.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/UT_ObjectPoolCache.h rename to cortex-9.7.0/include/IECoreHoudini/UT_ObjectPoolCache.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/LiveSceneBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/LiveSceneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/LiveSceneBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/LiveSceneBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreHoudini/bindings/TypeIdBinding.h b/cortex-9.7.0/include/IECoreHoudini/bindings/TypeIdBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreHoudini/bindings/TypeIdBinding.h rename to cortex-9.7.0/include/IECoreHoudini/bindings/TypeIdBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/BoolParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/BoolParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/BoolParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/BoolParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/Box3Manipulator.h b/cortex-9.7.0/include/IECoreMaya/Box3Manipulator.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/Box3Manipulator.h rename to cortex-9.7.0/include/IECoreMaya/Box3Manipulator.h diff --git a/cortex-9.6.0/include/IECoreMaya/BoxParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/BoxParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/BoxParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/BoxParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/BoxTraits.h b/cortex-9.7.0/include/IECoreMaya/BoxTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/BoxTraits.h rename to cortex-9.7.0/include/IECoreMaya/BoxTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/CacheSet.h b/cortex-9.7.0/include/IECoreMaya/CacheSet.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/CacheSet.h rename to cortex-9.7.0/include/IECoreMaya/CacheSet.h diff --git a/cortex-9.6.0/include/IECoreMaya/CallbackId.h b/cortex-9.7.0/include/IECoreMaya/CallbackId.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/CallbackId.h rename to cortex-9.7.0/include/IECoreMaya/CallbackId.h diff --git a/cortex-9.6.0/include/IECoreMaya/ClassParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ClassParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ClassParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ClassParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/ClassVectorParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ClassVectorParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ClassVectorParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ClassVectorParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/ColorSplineParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ColorSplineParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ColorSplineParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ColorSplineParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/CompoundNumericParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/CompoundNumericParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/CompoundNumericParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/CompoundNumericParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/CompoundParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/CompoundParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/CompoundParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/CompoundParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/Convert.h b/cortex-9.7.0/include/IECoreMaya/Convert.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/Convert.h rename to cortex-9.7.0/include/IECoreMaya/Convert.h diff --git a/cortex-9.6.0/include/IECoreMaya/ConverterHolder.h b/cortex-9.7.0/include/IECoreMaya/ConverterHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ConverterHolder.h rename to cortex-9.7.0/include/IECoreMaya/ConverterHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/CurveCombiner.h b/cortex-9.7.0/include/IECoreMaya/CurveCombiner.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/CurveCombiner.h rename to cortex-9.7.0/include/IECoreMaya/CurveCombiner.h diff --git a/cortex-9.6.0/include/IECoreMaya/DateTimeParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/DateTimeParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/DateTimeParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/DateTimeParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/DelightProceduralCacheCommand.h b/cortex-9.7.0/include/IECoreMaya/DelightProceduralCacheCommand.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/DelightProceduralCacheCommand.h rename to cortex-9.7.0/include/IECoreMaya/DelightProceduralCacheCommand.h diff --git a/cortex-9.6.0/include/IECoreMaya/DisplayStyle.h b/cortex-9.7.0/include/IECoreMaya/DisplayStyle.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/DisplayStyle.h rename to cortex-9.7.0/include/IECoreMaya/DisplayStyle.h diff --git a/cortex-9.6.0/include/IECoreMaya/DrawableHolder.h b/cortex-9.7.0/include/IECoreMaya/DrawableHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/DrawableHolder.h rename to cortex-9.7.0/include/IECoreMaya/DrawableHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/DrawableHolderUI.h b/cortex-9.7.0/include/IECoreMaya/DrawableHolderUI.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/DrawableHolderUI.h rename to cortex-9.7.0/include/IECoreMaya/DrawableHolderUI.h diff --git a/cortex-9.6.0/include/IECoreMaya/FloatSplineParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/FloatSplineParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FloatSplineParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/FloatSplineParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaArrayDataConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaArrayDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaArrayDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaArrayDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaCameraConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaCameraConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaCameraConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaCameraConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaCurveConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaCurveConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaCurveConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaCurveConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaDagNodeConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaDagNodeConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaDagNodeConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaDagNodeConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaDagNodeConverter.inl b/cortex-9.7.0/include/IECoreMaya/FromMayaDagNodeConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaDagNodeConverter.inl rename to cortex-9.7.0/include/IECoreMaya/FromMayaDagNodeConverter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaFluidConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaFluidConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaFluidConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaFluidConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaGroupConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaGroupConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaGroupConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaGroupConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaImageConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaImageConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaImageConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaImageConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaLocatorConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaLocatorConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaLocatorConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaLocatorConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaMatrixDataConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaMatrixDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaMatrixDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaMatrixDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaMeshConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaMeshConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaMeshConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaMeshConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaNumericDataConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaNumericDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaNumericDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaNumericDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaNumericPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaNumericPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaNumericPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaNumericPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaObjectConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaObjectConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaObjectConverter.inl b/cortex-9.7.0/include/IECoreMaya/FromMayaObjectConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaObjectConverter.inl rename to cortex-9.7.0/include/IECoreMaya/FromMayaObjectConverter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaObjectDataConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaObjectDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaObjectDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaObjectDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaParticleConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaParticleConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaParticleConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaParticleConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaPlugConverter.inl b/cortex-9.7.0/include/IECoreMaya/FromMayaPlugConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaPlugConverter.inl rename to cortex-9.7.0/include/IECoreMaya/FromMayaPlugConverter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaPluginDataPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaPluginDataPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaPluginDataPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaPluginDataPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaProceduralHolderConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaProceduralHolderConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaProceduralHolderConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaProceduralHolderConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaShapeConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaShapeConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaShapeConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaShapeConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaShapeConverter.inl b/cortex-9.7.0/include/IECoreMaya/FromMayaShapeConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaShapeConverter.inl rename to cortex-9.7.0/include/IECoreMaya/FromMayaShapeConverter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaSkinClusterConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaSkinClusterConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaSkinClusterConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaSkinClusterConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaStringPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaStringPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaStringPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaStringPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaTransformConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaTransformConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaTransformConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaTransformConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaTransformationMatrixConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaTransformationMatrixConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaTransformationMatrixConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaTransformationMatrixConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/FromMayaUnitPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/FromMayaUnitPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/FromMayaUnitPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/FromMayaUnitPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/GeometryCombiner.h b/cortex-9.7.0/include/IECoreMaya/GeometryCombiner.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/GeometryCombiner.h rename to cortex-9.7.0/include/IECoreMaya/GeometryCombiner.h diff --git a/cortex-9.6.0/include/IECoreMaya/IECoreMaya.h b/cortex-9.7.0/include/IECoreMaya/IECoreMaya.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/IECoreMaya.h rename to cortex-9.7.0/include/IECoreMaya/IECoreMaya.h diff --git a/cortex-9.6.0/include/IECoreMaya/ImageFile.h b/cortex-9.7.0/include/IECoreMaya/ImageFile.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ImageFile.h rename to cortex-9.7.0/include/IECoreMaya/ImageFile.h diff --git a/cortex-9.6.0/include/IECoreMaya/ImagePlaneHolder.h b/cortex-9.7.0/include/IECoreMaya/ImagePlaneHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ImagePlaneHolder.h rename to cortex-9.7.0/include/IECoreMaya/ImagePlaneHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/ImageViewportPostProcess.h b/cortex-9.7.0/include/IECoreMaya/ImageViewportPostProcess.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ImageViewportPostProcess.h rename to cortex-9.7.0/include/IECoreMaya/ImageViewportPostProcess.h diff --git a/cortex-9.6.0/include/IECoreMaya/LineSegmentParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/LineSegmentParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/LineSegmentParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/LineSegmentParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/LiveScene.h b/cortex-9.7.0/include/IECoreMaya/LiveScene.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/LiveScene.h rename to cortex-9.7.0/include/IECoreMaya/LiveScene.h diff --git a/cortex-9.6.0/include/IECoreMaya/MArrayIter.h b/cortex-9.7.0/include/IECoreMaya/MArrayIter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MArrayIter.h rename to cortex-9.7.0/include/IECoreMaya/MArrayIter.h diff --git a/cortex-9.6.0/include/IECoreMaya/MArrayIter.inl b/cortex-9.7.0/include/IECoreMaya/MArrayIter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MArrayIter.inl rename to cortex-9.7.0/include/IECoreMaya/MArrayIter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/MArrayTraits.h b/cortex-9.7.0/include/IECoreMaya/MArrayTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MArrayTraits.h rename to cortex-9.7.0/include/IECoreMaya/MArrayTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/MDataHandleAccessor.h b/cortex-9.7.0/include/IECoreMaya/MDataHandleAccessor.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MDataHandleAccessor.h rename to cortex-9.7.0/include/IECoreMaya/MDataHandleAccessor.h diff --git a/cortex-9.6.0/include/IECoreMaya/MDataHandleAccessor.inl b/cortex-9.7.0/include/IECoreMaya/MDataHandleAccessor.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MDataHandleAccessor.inl rename to cortex-9.7.0/include/IECoreMaya/MDataHandleAccessor.inl diff --git a/cortex-9.6.0/include/IECoreMaya/MFloatPointTree.h b/cortex-9.7.0/include/IECoreMaya/MFloatPointTree.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MFloatPointTree.h rename to cortex-9.7.0/include/IECoreMaya/MFloatPointTree.h diff --git a/cortex-9.6.0/include/IECoreMaya/MFloatVectorTree.h b/cortex-9.7.0/include/IECoreMaya/MFloatVectorTree.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MFloatVectorTree.h rename to cortex-9.7.0/include/IECoreMaya/MFloatVectorTree.h diff --git a/cortex-9.6.0/include/IECoreMaya/MFnDataTypeTraits.h b/cortex-9.7.0/include/IECoreMaya/MFnDataTypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MFnDataTypeTraits.h rename to cortex-9.7.0/include/IECoreMaya/MFnDataTypeTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/MImageAccessor.h b/cortex-9.7.0/include/IECoreMaya/MImageAccessor.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MImageAccessor.h rename to cortex-9.7.0/include/IECoreMaya/MImageAccessor.h diff --git a/cortex-9.6.0/include/IECoreMaya/MImageAccessor.inl b/cortex-9.7.0/include/IECoreMaya/MImageAccessor.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MImageAccessor.inl rename to cortex-9.7.0/include/IECoreMaya/MImageAccessor.inl diff --git a/cortex-9.6.0/include/IECoreMaya/MPointTree.h b/cortex-9.7.0/include/IECoreMaya/MPointTree.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MPointTree.h rename to cortex-9.7.0/include/IECoreMaya/MPointTree.h diff --git a/cortex-9.6.0/include/IECoreMaya/MStringLess.h b/cortex-9.7.0/include/IECoreMaya/MStringLess.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MStringLess.h rename to cortex-9.7.0/include/IECoreMaya/MStringLess.h diff --git a/cortex-9.6.0/include/IECoreMaya/MVectorTree.h b/cortex-9.7.0/include/IECoreMaya/MVectorTree.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MVectorTree.h rename to cortex-9.7.0/include/IECoreMaya/MVectorTree.h diff --git a/cortex-9.6.0/include/IECoreMaya/MatrixTraits.h b/cortex-9.7.0/include/IECoreMaya/MatrixTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MatrixTraits.h rename to cortex-9.7.0/include/IECoreMaya/MatrixTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/MayaMeshBuilder.h b/cortex-9.7.0/include/IECoreMaya/MayaMeshBuilder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MayaMeshBuilder.h rename to cortex-9.7.0/include/IECoreMaya/MayaMeshBuilder.h diff --git a/cortex-9.6.0/include/IECoreMaya/MayaMeshBuilder.inl b/cortex-9.7.0/include/IECoreMaya/MayaMeshBuilder.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MayaMeshBuilder.inl rename to cortex-9.7.0/include/IECoreMaya/MayaMeshBuilder.inl diff --git a/cortex-9.6.0/include/IECoreMaya/MayaPythonUtil.h b/cortex-9.7.0/include/IECoreMaya/MayaPythonUtil.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MayaPythonUtil.h rename to cortex-9.7.0/include/IECoreMaya/MayaPythonUtil.h diff --git a/cortex-9.6.0/include/IECoreMaya/MayaTime.h b/cortex-9.7.0/include/IECoreMaya/MayaTime.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MayaTime.h rename to cortex-9.7.0/include/IECoreMaya/MayaTime.h diff --git a/cortex-9.6.0/include/IECoreMaya/MayaTypeIds.h b/cortex-9.7.0/include/IECoreMaya/MayaTypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MayaTypeIds.h rename to cortex-9.7.0/include/IECoreMaya/MayaTypeIds.h diff --git a/cortex-9.6.0/include/IECoreMaya/MeshParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/MeshParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MeshParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/MeshParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/MessageHandler.h b/cortex-9.7.0/include/IECoreMaya/MessageHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/MessageHandler.h rename to cortex-9.7.0/include/IECoreMaya/MessageHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/NumericParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/NumericParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/NumericParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/NumericParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/NumericTraits.h b/cortex-9.7.0/include/IECoreMaya/NumericTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/NumericTraits.h rename to cortex-9.7.0/include/IECoreMaya/NumericTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/ObjectData.h b/cortex-9.7.0/include/IECoreMaya/ObjectData.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ObjectData.h rename to cortex-9.7.0/include/IECoreMaya/ObjectData.h diff --git a/cortex-9.6.0/include/IECoreMaya/ObjectMFnDataParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ObjectMFnDataParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ObjectMFnDataParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ObjectMFnDataParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/ObjectParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ObjectParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ObjectParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ObjectParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/ObjectVectorParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ObjectVectorParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ObjectVectorParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ObjectVectorParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/OpHolder.h b/cortex-9.7.0/include/IECoreMaya/OpHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/OpHolder.h rename to cortex-9.7.0/include/IECoreMaya/OpHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/ParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/ParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterHandler.inl b/cortex-9.7.0/include/IECoreMaya/ParameterHandler.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterHandler.inl rename to cortex-9.7.0/include/IECoreMaya/ParameterHandler.inl diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterManipContainer.h b/cortex-9.7.0/include/IECoreMaya/ParameterManipContainer.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterManipContainer.h rename to cortex-9.7.0/include/IECoreMaya/ParameterManipContainer.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolder.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolder.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolderInterface.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolderInterface.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolderInterface.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolderInterface.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolderManipContext.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolderManipContext.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolderManipContext.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolderManipContext.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolderManipContextCommand.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolderManipContextCommand.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolderManipContextCommand.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolderManipContextCommand.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolderModificationCmd.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolderModificationCmd.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolderModificationCmd.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolderModificationCmd.h diff --git a/cortex-9.6.0/include/IECoreMaya/ParameterisedHolderSetValueCmd.h b/cortex-9.7.0/include/IECoreMaya/ParameterisedHolderSetValueCmd.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ParameterisedHolderSetValueCmd.h rename to cortex-9.7.0/include/IECoreMaya/ParameterisedHolderSetValueCmd.h diff --git a/cortex-9.6.0/include/IECoreMaya/PlaybackFrameList.h b/cortex-9.7.0/include/IECoreMaya/PlaybackFrameList.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/PlaybackFrameList.h rename to cortex-9.7.0/include/IECoreMaya/PlaybackFrameList.h diff --git a/cortex-9.6.0/include/IECoreMaya/PostLoadCallback.h b/cortex-9.7.0/include/IECoreMaya/PostLoadCallback.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/PostLoadCallback.h rename to cortex-9.7.0/include/IECoreMaya/PostLoadCallback.h diff --git a/cortex-9.6.0/include/IECoreMaya/ProceduralHolder.h b/cortex-9.7.0/include/IECoreMaya/ProceduralHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ProceduralHolder.h rename to cortex-9.7.0/include/IECoreMaya/ProceduralHolder.h diff --git a/cortex-9.6.0/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h b/cortex-9.7.0/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h rename to cortex-9.7.0/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h diff --git a/cortex-9.6.0/include/IECoreMaya/ProceduralHolderUI.h b/cortex-9.7.0/include/IECoreMaya/ProceduralHolderUI.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ProceduralHolderUI.h rename to cortex-9.7.0/include/IECoreMaya/ProceduralHolderUI.h diff --git a/cortex-9.6.0/include/IECoreMaya/PythonCmd.h b/cortex-9.7.0/include/IECoreMaya/PythonCmd.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/PythonCmd.h rename to cortex-9.7.0/include/IECoreMaya/PythonCmd.h diff --git a/cortex-9.6.0/include/IECoreMaya/SceneShape.h b/cortex-9.7.0/include/IECoreMaya/SceneShape.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/SceneShape.h rename to cortex-9.7.0/include/IECoreMaya/SceneShape.h diff --git a/cortex-9.6.0/include/IECoreMaya/SceneShapeInterface.h b/cortex-9.7.0/include/IECoreMaya/SceneShapeInterface.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/SceneShapeInterface.h rename to cortex-9.7.0/include/IECoreMaya/SceneShapeInterface.h diff --git a/cortex-9.6.0/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h b/cortex-9.7.0/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h rename to cortex-9.7.0/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h diff --git a/cortex-9.6.0/include/IECoreMaya/SceneShapeUI.h b/cortex-9.7.0/include/IECoreMaya/SceneShapeUI.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/SceneShapeUI.h rename to cortex-9.7.0/include/IECoreMaya/SceneShapeUI.h diff --git a/cortex-9.6.0/include/IECoreMaya/StatusException.h b/cortex-9.7.0/include/IECoreMaya/StatusException.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/StatusException.h rename to cortex-9.7.0/include/IECoreMaya/StatusException.h diff --git a/cortex-9.6.0/include/IECoreMaya/StringParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/StringParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/StringParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/StringParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/StringVectorParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/StringVectorParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/StringVectorParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/StringVectorParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/SystemExitCmd.h b/cortex-9.7.0/include/IECoreMaya/SystemExitCmd.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/SystemExitCmd.h rename to cortex-9.7.0/include/IECoreMaya/SystemExitCmd.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaArrayDataConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaArrayDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaArrayDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaArrayDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaCameraConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaCameraConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaCameraConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaCameraConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaCurveConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaCurveConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaCurveConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaCurveConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaGroupConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaGroupConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaGroupConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaGroupConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaImageConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaImageConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaImageConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaImageConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaLocatorConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaLocatorConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaLocatorConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaLocatorConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaMatrixDataConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaMatrixDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaMatrixDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaMatrixDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaMeshConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaMeshConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaMeshConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaMeshConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaNumericDataConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaNumericDataConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaNumericDataConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaNumericDataConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaObjectConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaObjectConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaObjectConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaObjectConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaObjectConverter.inl b/cortex-9.7.0/include/IECoreMaya/ToMayaObjectConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaObjectConverter.inl rename to cortex-9.7.0/include/IECoreMaya/ToMayaObjectConverter.inl diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaParticleConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaParticleConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaParticleConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaParticleConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaPlugConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaPlugConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaPlugConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaPlugConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/ToMayaSkinClusterConverter.h b/cortex-9.7.0/include/IECoreMaya/ToMayaSkinClusterConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ToMayaSkinClusterConverter.h rename to cortex-9.7.0/include/IECoreMaya/ToMayaSkinClusterConverter.h diff --git a/cortex-9.6.0/include/IECoreMaya/TransformationMatrixManipulator.h b/cortex-9.7.0/include/IECoreMaya/TransformationMatrixManipulator.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/TransformationMatrixManipulator.h rename to cortex-9.7.0/include/IECoreMaya/TransformationMatrixManipulator.h diff --git a/cortex-9.6.0/include/IECoreMaya/TransformationMatrixParameterHandler.h b/cortex-9.7.0/include/IECoreMaya/TransformationMatrixParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/TransformationMatrixParameterHandler.h rename to cortex-9.7.0/include/IECoreMaya/TransformationMatrixParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreMaya/TransientParameterisedHolderNode.h b/cortex-9.7.0/include/IECoreMaya/TransientParameterisedHolderNode.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/TransientParameterisedHolderNode.h rename to cortex-9.7.0/include/IECoreMaya/TransientParameterisedHolderNode.h diff --git a/cortex-9.6.0/include/IECoreMaya/TypeIds.h b/cortex-9.7.0/include/IECoreMaya/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/TypeIds.h rename to cortex-9.7.0/include/IECoreMaya/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreMaya/TypeTraits.h b/cortex-9.7.0/include/IECoreMaya/TypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/TypeTraits.h rename to cortex-9.7.0/include/IECoreMaya/TypeTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/UnitTraits.h b/cortex-9.7.0/include/IECoreMaya/UnitTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/UnitTraits.h rename to cortex-9.7.0/include/IECoreMaya/UnitTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/V3Manipulator.h b/cortex-9.7.0/include/IECoreMaya/V3Manipulator.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/V3Manipulator.h rename to cortex-9.7.0/include/IECoreMaya/V3Manipulator.h diff --git a/cortex-9.6.0/include/IECoreMaya/VectorTraits.h b/cortex-9.7.0/include/IECoreMaya/VectorTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/VectorTraits.h rename to cortex-9.7.0/include/IECoreMaya/VectorTraits.h diff --git a/cortex-9.6.0/include/IECoreMaya/ViewportPostProcess.h b/cortex-9.7.0/include/IECoreMaya/ViewportPostProcess.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ViewportPostProcess.h rename to cortex-9.7.0/include/IECoreMaya/ViewportPostProcess.h diff --git a/cortex-9.6.0/include/IECoreMaya/ViewportPostProcessCallback.h b/cortex-9.7.0/include/IECoreMaya/ViewportPostProcessCallback.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/ViewportPostProcessCallback.h rename to cortex-9.7.0/include/IECoreMaya/ViewportPostProcessCallback.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/CallbackIdBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/CallbackIdBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/CallbackIdBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/CallbackIdBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FnProceduralHolderBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FnProceduralHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FnProceduralHolderBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FnProceduralHolderBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FnSceneShapeBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FnSceneShapeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FnSceneShapeBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FnSceneShapeBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/LiveSceneBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/LiveSceneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/LiveSceneBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/LiveSceneBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MDagPathFromPython.h b/cortex-9.7.0/include/IECoreMaya/bindings/MDagPathFromPython.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MDagPathFromPython.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MDagPathFromPython.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MObjectFromPython.h b/cortex-9.7.0/include/IECoreMaya/bindings/MObjectFromPython.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MObjectFromPython.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MObjectFromPython.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MPlugFromPython.h b/cortex-9.7.0/include/IECoreMaya/bindings/MPlugFromPython.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MPlugFromPython.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MPlugFromPython.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MStringFromPython.h b/cortex-9.7.0/include/IECoreMaya/bindings/MStringFromPython.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MStringFromPython.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MStringFromPython.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MayaPythonUtilBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/MayaPythonUtilBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MayaPythonUtilBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MayaPythonUtilBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MayaTypeIdBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/MayaTypeIdBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MayaTypeIdBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MayaTypeIdBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/MessageHandlerBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/MessageHandlerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/MessageHandlerBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/MessageHandlerBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/PlaybackFrameListBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/PlaybackFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/PlaybackFrameListBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/PlaybackFrameListBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/StandaloneBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/StandaloneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/StandaloneBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/StandaloneBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/TypeIdBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/TypeIdBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/TypeIdBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/TypeIdBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ViewportPostProcessBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ViewportPostProcessBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ViewportPostProcessBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ViewportPostProcessBinding.h diff --git a/cortex-9.6.0/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h b/cortex-9.7.0/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h rename to cortex-9.7.0/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h diff --git a/cortex-9.6.0/include/IECoreNuke/BoolParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/BoolParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/BoolParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/BoolParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/Box3ParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/Box3ParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Box3ParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/Box3ParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/ClassParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/ClassParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ClassParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/ClassParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/ClassVectorParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/ClassVectorParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ClassVectorParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/ClassVectorParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/Color3fParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/Color3fParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Color3fParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/Color3fParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/CompoundParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/CompoundParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/CompoundParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/CompoundParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/Convert.h b/cortex-9.7.0/include/IECoreNuke/Convert.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Convert.h rename to cortex-9.7.0/include/IECoreNuke/Convert.h diff --git a/cortex-9.6.0/include/IECoreNuke/CurveLookup.h b/cortex-9.7.0/include/IECoreNuke/CurveLookup.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/CurveLookup.h rename to cortex-9.7.0/include/IECoreNuke/CurveLookup.h diff --git a/cortex-9.6.0/include/IECoreNuke/CurveLookup.inl b/cortex-9.7.0/include/IECoreNuke/CurveLookup.inl similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/CurveLookup.inl rename to cortex-9.7.0/include/IECoreNuke/CurveLookup.inl diff --git a/cortex-9.6.0/include/IECoreNuke/DeepImageReader.h b/cortex-9.7.0/include/IECoreNuke/DeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/DeepImageReader.h rename to cortex-9.7.0/include/IECoreNuke/DeepImageReader.h diff --git a/cortex-9.6.0/include/IECoreNuke/DisplayIop.h b/cortex-9.7.0/include/IECoreNuke/DisplayIop.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/DisplayIop.h rename to cortex-9.7.0/include/IECoreNuke/DisplayIop.h diff --git a/cortex-9.6.0/include/IECoreNuke/DrawableHolder.h b/cortex-9.7.0/include/IECoreNuke/DrawableHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/DrawableHolder.h rename to cortex-9.7.0/include/IECoreNuke/DrawableHolder.h diff --git a/cortex-9.6.0/include/IECoreNuke/FloatParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/FloatParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/FloatParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/FloatParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/FromNukeCameraConverter.h b/cortex-9.7.0/include/IECoreNuke/FromNukeCameraConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/FromNukeCameraConverter.h rename to cortex-9.7.0/include/IECoreNuke/FromNukeCameraConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/FromNukeConverter.h b/cortex-9.7.0/include/IECoreNuke/FromNukeConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/FromNukeConverter.h rename to cortex-9.7.0/include/IECoreNuke/FromNukeConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/FromNukePointsConverter.h b/cortex-9.7.0/include/IECoreNuke/FromNukePointsConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/FromNukePointsConverter.h rename to cortex-9.7.0/include/IECoreNuke/FromNukePointsConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/FromNukeTileConverter.h b/cortex-9.7.0/include/IECoreNuke/FromNukeTileConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/FromNukeTileConverter.h rename to cortex-9.7.0/include/IECoreNuke/FromNukeTileConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/Hash.h b/cortex-9.7.0/include/IECoreNuke/Hash.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Hash.h rename to cortex-9.7.0/include/IECoreNuke/Hash.h diff --git a/cortex-9.6.0/include/IECoreNuke/Hash.inl b/cortex-9.7.0/include/IECoreNuke/Hash.inl similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Hash.inl rename to cortex-9.7.0/include/IECoreNuke/Hash.inl diff --git a/cortex-9.6.0/include/IECoreNuke/ImagePrimitiveParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/ImagePrimitiveParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ImagePrimitiveParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/ImagePrimitiveParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/IntParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/IntParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/IntParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/IntParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/LensDistort.h b/cortex-9.7.0/include/IECoreNuke/LensDistort.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/LensDistort.h rename to cortex-9.7.0/include/IECoreNuke/LensDistort.h diff --git a/cortex-9.6.0/include/IECoreNuke/LineSegment3ParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/LineSegment3ParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/LineSegment3ParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/LineSegment3ParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/MeshFromNuke.h b/cortex-9.7.0/include/IECoreNuke/MeshFromNuke.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/MeshFromNuke.h rename to cortex-9.7.0/include/IECoreNuke/MeshFromNuke.h diff --git a/cortex-9.6.0/include/IECoreNuke/MeshPrimitiveParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/MeshPrimitiveParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/MeshPrimitiveParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/MeshPrimitiveParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/MeshToNukeGeometryConverter.h b/cortex-9.7.0/include/IECoreNuke/MeshToNukeGeometryConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/MeshToNukeGeometryConverter.h rename to cortex-9.7.0/include/IECoreNuke/MeshToNukeGeometryConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/ObjectHolder.h b/cortex-9.7.0/include/IECoreNuke/ObjectHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ObjectHolder.h rename to cortex-9.7.0/include/IECoreNuke/ObjectHolder.h diff --git a/cortex-9.6.0/include/IECoreNuke/ObjectKnob.h b/cortex-9.7.0/include/IECoreNuke/ObjectKnob.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ObjectKnob.h rename to cortex-9.7.0/include/IECoreNuke/ObjectKnob.h diff --git a/cortex-9.6.0/include/IECoreNuke/ObjectVectorParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/ObjectVectorParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ObjectVectorParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/ObjectVectorParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/OpHolder.h b/cortex-9.7.0/include/IECoreNuke/OpHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/OpHolder.h rename to cortex-9.7.0/include/IECoreNuke/OpHolder.h diff --git a/cortex-9.6.0/include/IECoreNuke/ParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/ParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/ParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/ParameterisedHolder.h b/cortex-9.7.0/include/IECoreNuke/ParameterisedHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ParameterisedHolder.h rename to cortex-9.7.0/include/IECoreNuke/ParameterisedHolder.h diff --git a/cortex-9.6.0/include/IECoreNuke/PathParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/PathParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/PathParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/PathParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/PointToNukeGeometryConverter.h b/cortex-9.7.0/include/IECoreNuke/PointToNukeGeometryConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/PointToNukeGeometryConverter.h rename to cortex-9.7.0/include/IECoreNuke/PointToNukeGeometryConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/PresetsOnlyParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/PresetsOnlyParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/PresetsOnlyParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/PresetsOnlyParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/ProceduralHolder.h b/cortex-9.7.0/include/IECoreNuke/ProceduralHolder.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ProceduralHolder.h rename to cortex-9.7.0/include/IECoreNuke/ProceduralHolder.h diff --git a/cortex-9.6.0/include/IECoreNuke/SceneCacheReader.h b/cortex-9.7.0/include/IECoreNuke/SceneCacheReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/SceneCacheReader.h rename to cortex-9.7.0/include/IECoreNuke/SceneCacheReader.h diff --git a/cortex-9.6.0/include/IECoreNuke/StringParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/StringParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/StringParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/StringParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/ToNukeConverter.h b/cortex-9.7.0/include/IECoreNuke/ToNukeConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ToNukeConverter.h rename to cortex-9.7.0/include/IECoreNuke/ToNukeConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/ToNukeGeometryConverter.h b/cortex-9.7.0/include/IECoreNuke/ToNukeGeometryConverter.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ToNukeGeometryConverter.h rename to cortex-9.7.0/include/IECoreNuke/ToNukeGeometryConverter.h diff --git a/cortex-9.6.0/include/IECoreNuke/ToNukeGeometryConverter.inl b/cortex-9.7.0/include/IECoreNuke/ToNukeGeometryConverter.inl similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/ToNukeGeometryConverter.inl rename to cortex-9.7.0/include/IECoreNuke/ToNukeGeometryConverter.inl diff --git a/cortex-9.6.0/include/IECoreNuke/TypeIds.h b/cortex-9.7.0/include/IECoreNuke/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/TypeIds.h rename to cortex-9.7.0/include/IECoreNuke/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreNuke/VecParameterHandler.h b/cortex-9.7.0/include/IECoreNuke/VecParameterHandler.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/VecParameterHandler.h rename to cortex-9.7.0/include/IECoreNuke/VecParameterHandler.h diff --git a/cortex-9.6.0/include/IECoreNuke/Warp.h b/cortex-9.7.0/include/IECoreNuke/Warp.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/Warp.h rename to cortex-9.7.0/include/IECoreNuke/Warp.h diff --git a/cortex-9.6.0/include/IECoreNuke/bindings/FnOpHolderBinding.h b/cortex-9.7.0/include/IECoreNuke/bindings/FnOpHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/bindings/FnOpHolderBinding.h rename to cortex-9.7.0/include/IECoreNuke/bindings/FnOpHolderBinding.h diff --git a/cortex-9.6.0/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h b/cortex-9.7.0/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h rename to cortex-9.7.0/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.6.0/include/IECoreNuke/bindings/ObjectKnobBinding.h b/cortex-9.7.0/include/IECoreNuke/bindings/ObjectKnobBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreNuke/bindings/ObjectKnobBinding.h rename to cortex-9.7.0/include/IECoreNuke/bindings/ObjectKnobBinding.h diff --git a/cortex-9.6.0/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h b/cortex-9.7.0/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h rename to cortex-9.7.0/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/AlexaLogcToLinearOpBinding.h b/cortex-9.7.0/include/IECorePython/AlexaLogcToLinearOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/AlexaLogcToLinearOpBinding.h rename to cortex-9.7.0/include/IECorePython/AlexaLogcToLinearOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/AngleConversionBinding.h b/cortex-9.7.0/include/IECorePython/AngleConversionBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/AngleConversionBinding.h rename to cortex-9.7.0/include/IECorePython/AngleConversionBinding.h diff --git a/cortex-9.6.0/include/IECorePython/AttributeStateBinding.h b/cortex-9.7.0/include/IECorePython/AttributeStateBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/AttributeStateBinding.h rename to cortex-9.7.0/include/IECorePython/AttributeStateBinding.h diff --git a/cortex-9.6.0/include/IECorePython/BezierAlgoBinding.h b/cortex-9.7.0/include/IECorePython/BezierAlgoBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/BezierAlgoBinding.h rename to cortex-9.7.0/include/IECorePython/BezierAlgoBinding.h diff --git a/cortex-9.6.0/include/IECorePython/BinaryFrameListBinding.h b/cortex-9.7.0/include/IECorePython/BinaryFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/BinaryFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/BinaryFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/BlindDataHolderBinding.h b/cortex-9.7.0/include/IECorePython/BlindDataHolderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/BlindDataHolderBinding.h rename to cortex-9.7.0/include/IECorePython/BlindDataHolderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/BoundedKDTreeBinding.h b/cortex-9.7.0/include/IECorePython/BoundedKDTreeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/BoundedKDTreeBinding.h rename to cortex-9.7.0/include/IECorePython/BoundedKDTreeBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CINImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/CINImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CINImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/CINImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CINImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/CINImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CINImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/CINImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CachedReaderBinding.h b/cortex-9.7.0/include/IECorePython/CachedReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CachedReaderBinding.h rename to cortex-9.7.0/include/IECorePython/CachedReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CamelCaseBinding.h b/cortex-9.7.0/include/IECorePython/CamelCaseBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CamelCaseBinding.h rename to cortex-9.7.0/include/IECorePython/CamelCaseBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CameraBinding.h b/cortex-9.7.0/include/IECorePython/CameraBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CameraBinding.h rename to cortex-9.7.0/include/IECorePython/CameraBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CameraControllerBinding.h b/cortex-9.7.0/include/IECorePython/CameraControllerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CameraControllerBinding.h rename to cortex-9.7.0/include/IECorePython/CameraControllerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CapturingRendererBinding.h b/cortex-9.7.0/include/IECorePython/CapturingRendererBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CapturingRendererBinding.h rename to cortex-9.7.0/include/IECorePython/CapturingRendererBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ChannelOpBinding.h b/cortex-9.7.0/include/IECorePython/ChannelOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ChannelOpBinding.h rename to cortex-9.7.0/include/IECorePython/ChannelOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CineonToLinearOpBinding.h b/cortex-9.7.0/include/IECorePython/CineonToLinearOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CineonToLinearOpBinding.h rename to cortex-9.7.0/include/IECorePython/CineonToLinearOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ClampOpBinding.h b/cortex-9.7.0/include/IECorePython/ClampOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ClampOpBinding.h rename to cortex-9.7.0/include/IECorePython/ClampOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ClientDisplayDriverBinding.h b/cortex-9.7.0/include/IECorePython/ClientDisplayDriverBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ClientDisplayDriverBinding.h rename to cortex-9.7.0/include/IECorePython/ClientDisplayDriverBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ClippingPlaneBinding.h b/cortex-9.7.0/include/IECorePython/ClippingPlaneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ClippingPlaneBinding.h rename to cortex-9.7.0/include/IECorePython/ClippingPlaneBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ColorSpaceTransformOpBinding.h b/cortex-9.7.0/include/IECorePython/ColorSpaceTransformOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ColorSpaceTransformOpBinding.h rename to cortex-9.7.0/include/IECorePython/ColorSpaceTransformOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ColorTransformOpBinding.h b/cortex-9.7.0/include/IECorePython/ColorTransformOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ColorTransformOpBinding.h rename to cortex-9.7.0/include/IECorePython/ColorTransformOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CompoundDataBinding.h b/cortex-9.7.0/include/IECorePython/CompoundDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CompoundDataBinding.h rename to cortex-9.7.0/include/IECorePython/CompoundDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CompoundFrameListBinding.h b/cortex-9.7.0/include/IECorePython/CompoundFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CompoundFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/CompoundFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CompoundObjectBinding.h b/cortex-9.7.0/include/IECorePython/CompoundObjectBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CompoundObjectBinding.h rename to cortex-9.7.0/include/IECorePython/CompoundObjectBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CompoundParameterBinding.h b/cortex-9.7.0/include/IECorePython/CompoundParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CompoundParameterBinding.h rename to cortex-9.7.0/include/IECorePython/CompoundParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CompressSmoothSkinningDataOpBinding.h b/cortex-9.7.0/include/IECorePython/CompressSmoothSkinningDataOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CompressSmoothSkinningDataOpBinding.h rename to cortex-9.7.0/include/IECorePython/CompressSmoothSkinningDataOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h b/cortex-9.7.0/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h rename to cortex-9.7.0/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ConverterBinding.h b/cortex-9.7.0/include/IECorePython/ConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ConverterBinding.h rename to cortex-9.7.0/include/IECorePython/ConverterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CoordinateSystemBinding.h b/cortex-9.7.0/include/IECorePython/CoordinateSystemBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CoordinateSystemBinding.h rename to cortex-9.7.0/include/IECorePython/CoordinateSystemBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CubeColorLookupBinding.h b/cortex-9.7.0/include/IECorePython/CubeColorLookupBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CubeColorLookupBinding.h rename to cortex-9.7.0/include/IECorePython/CubeColorLookupBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CubeColorLookupDataBinding.h b/cortex-9.7.0/include/IECorePython/CubeColorLookupDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CubeColorLookupDataBinding.h rename to cortex-9.7.0/include/IECorePython/CubeColorLookupDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CubeColorLookupParameterBinding.h b/cortex-9.7.0/include/IECorePython/CubeColorLookupParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CubeColorLookupParameterBinding.h rename to cortex-9.7.0/include/IECorePython/CubeColorLookupParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CubeColorTransformOpBinding.h b/cortex-9.7.0/include/IECorePython/CubeColorTransformOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CubeColorTransformOpBinding.h rename to cortex-9.7.0/include/IECorePython/CubeColorTransformOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CubicBasisBinding.h b/cortex-9.7.0/include/IECorePython/CubicBasisBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CubicBasisBinding.h rename to cortex-9.7.0/include/IECorePython/CubicBasisBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurveExtrudeOpBinding.h b/cortex-9.7.0/include/IECorePython/CurveExtrudeOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurveExtrudeOpBinding.h rename to cortex-9.7.0/include/IECorePython/CurveExtrudeOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurveLineariserBinding.h b/cortex-9.7.0/include/IECorePython/CurveLineariserBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurveLineariserBinding.h rename to cortex-9.7.0/include/IECorePython/CurveLineariserBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurveTangentsOpBinding.h b/cortex-9.7.0/include/IECorePython/CurveTangentsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurveTangentsOpBinding.h rename to cortex-9.7.0/include/IECorePython/CurveTangentsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurveTracerBinding.h b/cortex-9.7.0/include/IECorePython/CurveTracerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurveTracerBinding.h rename to cortex-9.7.0/include/IECorePython/CurveTracerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurvesMergeOpBinding.h b/cortex-9.7.0/include/IECorePython/CurvesMergeOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurvesMergeOpBinding.h rename to cortex-9.7.0/include/IECorePython/CurvesMergeOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurvesPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/CurvesPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurvesPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/CurvesPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DPXImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/DPXImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DPXImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/DPXImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DPXImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/DPXImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DPXImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/DPXImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataAlgoBinding.h b/cortex-9.7.0/include/IECorePython/DataAlgoBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataAlgoBinding.h rename to cortex-9.7.0/include/IECorePython/DataAlgoBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataBinding.h b/cortex-9.7.0/include/IECorePython/DataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataBinding.h rename to cortex-9.7.0/include/IECorePython/DataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataCastOpBinding.h b/cortex-9.7.0/include/IECorePython/DataCastOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataCastOpBinding.h rename to cortex-9.7.0/include/IECorePython/DataCastOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataConvertOpBinding.h b/cortex-9.7.0/include/IECorePython/DataConvertOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataConvertOpBinding.h rename to cortex-9.7.0/include/IECorePython/DataConvertOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataInterleaveOpBinding.h b/cortex-9.7.0/include/IECorePython/DataInterleaveOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataInterleaveOpBinding.h rename to cortex-9.7.0/include/IECorePython/DataInterleaveOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DataPromoteOpBinding.h b/cortex-9.7.0/include/IECorePython/DataPromoteOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DataPromoteOpBinding.h rename to cortex-9.7.0/include/IECorePython/DataPromoteOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DateTimeDataBinding.h b/cortex-9.7.0/include/IECorePython/DateTimeDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DateTimeDataBinding.h rename to cortex-9.7.0/include/IECorePython/DateTimeDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DateTimeParameterBinding.h b/cortex-9.7.0/include/IECorePython/DateTimeParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DateTimeParameterBinding.h rename to cortex-9.7.0/include/IECorePython/DateTimeParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h b/cortex-9.7.0/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h rename to cortex-9.7.0/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DeepImageConverterBinding.h b/cortex-9.7.0/include/IECorePython/DeepImageConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DeepImageConverterBinding.h rename to cortex-9.7.0/include/IECorePython/DeepImageConverterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DeepImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/DeepImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DeepImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/DeepImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DeepImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/DeepImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DeepImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/DeepImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DeepPixelBinding.h b/cortex-9.7.0/include/IECorePython/DeepPixelBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DeepPixelBinding.h rename to cortex-9.7.0/include/IECorePython/DeepPixelBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DirNameParameterBinding.h b/cortex-9.7.0/include/IECorePython/DirNameParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DirNameParameterBinding.h rename to cortex-9.7.0/include/IECorePython/DirNameParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DiskPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/DiskPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DiskPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/DiskPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DisplayBinding.h b/cortex-9.7.0/include/IECorePython/DisplayBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DisplayBinding.h rename to cortex-9.7.0/include/IECorePython/DisplayBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DisplayDriverBinding.h b/cortex-9.7.0/include/IECorePython/DisplayDriverBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DisplayDriverBinding.h rename to cortex-9.7.0/include/IECorePython/DisplayDriverBinding.h diff --git a/cortex-9.6.0/include/IECorePython/DisplayDriverServerBinding.h b/cortex-9.7.0/include/IECorePython/DisplayDriverServerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/DisplayDriverServerBinding.h rename to cortex-9.7.0/include/IECorePython/DisplayDriverServerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EXRDeepImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/EXRDeepImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EXRDeepImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/EXRDeepImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EXRDeepImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/EXRDeepImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EXRDeepImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/EXRDeepImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EXRImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/EXRImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EXRImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/EXRImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EXRImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/EXRImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EXRImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/EXRImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EmptyFrameListBinding.h b/cortex-9.7.0/include/IECorePython/EmptyFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EmptyFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/EmptyFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/EnvMapSamplerBinding.h b/cortex-9.7.0/include/IECorePython/EnvMapSamplerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/EnvMapSamplerBinding.h rename to cortex-9.7.0/include/IECorePython/EnvMapSamplerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ExceptionBinding.h b/cortex-9.7.0/include/IECorePython/ExceptionBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ExceptionBinding.h rename to cortex-9.7.0/include/IECorePython/ExceptionBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ExclusionFrameListBinding.h b/cortex-9.7.0/include/IECorePython/ExclusionFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ExclusionFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/ExclusionFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/Export.h b/cortex-9.7.0/include/IECorePython/Export.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/Export.h rename to cortex-9.7.0/include/IECorePython/Export.h diff --git a/cortex-9.6.0/include/IECorePython/ExternalProceduralBinding.h b/cortex-9.7.0/include/IECorePython/ExternalProceduralBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ExternalProceduralBinding.h rename to cortex-9.7.0/include/IECorePython/ExternalProceduralBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FaceAreaOpBinding.h b/cortex-9.7.0/include/IECorePython/FaceAreaOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FaceAreaOpBinding.h rename to cortex-9.7.0/include/IECorePython/FaceAreaOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FaceVaryingPromotionOpBinding.h b/cortex-9.7.0/include/IECorePython/FaceVaryingPromotionOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FaceVaryingPromotionOpBinding.h rename to cortex-9.7.0/include/IECorePython/FaceVaryingPromotionOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FileNameParameterBinding.h b/cortex-9.7.0/include/IECorePython/FileNameParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FileNameParameterBinding.h rename to cortex-9.7.0/include/IECorePython/FileNameParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FileSequenceBinding.h b/cortex-9.7.0/include/IECorePython/FileSequenceBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FileSequenceBinding.h rename to cortex-9.7.0/include/IECorePython/FileSequenceBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FileSequenceFunctionsBinding.h b/cortex-9.7.0/include/IECorePython/FileSequenceFunctionsBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FileSequenceFunctionsBinding.h rename to cortex-9.7.0/include/IECorePython/FileSequenceFunctionsBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FileSequenceParameterBinding.h b/cortex-9.7.0/include/IECorePython/FileSequenceParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FileSequenceParameterBinding.h rename to cortex-9.7.0/include/IECorePython/FileSequenceParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FileSequenceVectorParameterBinding.h b/cortex-9.7.0/include/IECorePython/FileSequenceVectorParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FileSequenceVectorParameterBinding.h rename to cortex-9.7.0/include/IECorePython/FileSequenceVectorParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FontBinding.h b/cortex-9.7.0/include/IECorePython/FontBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FontBinding.h rename to cortex-9.7.0/include/IECorePython/FontBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FrameListBinding.h b/cortex-9.7.0/include/IECorePython/FrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FrameListBinding.h rename to cortex-9.7.0/include/IECorePython/FrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FrameListParameterBinding.h b/cortex-9.7.0/include/IECorePython/FrameListParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FrameListParameterBinding.h rename to cortex-9.7.0/include/IECorePython/FrameListParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FrameRangeBinding.h b/cortex-9.7.0/include/IECorePython/FrameRangeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FrameRangeBinding.h rename to cortex-9.7.0/include/IECorePython/FrameRangeBinding.h diff --git a/cortex-9.6.0/include/IECorePython/FromCoreConverterBinding.h b/cortex-9.7.0/include/IECorePython/FromCoreConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/FromCoreConverterBinding.h rename to cortex-9.7.0/include/IECorePython/FromCoreConverterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/GeometricTypedDataBinding.h b/cortex-9.7.0/include/IECorePython/GeometricTypedDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/GeometricTypedDataBinding.h rename to cortex-9.7.0/include/IECorePython/GeometricTypedDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/GeometricTypedDataBinding.inl b/cortex-9.7.0/include/IECorePython/GeometricTypedDataBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/GeometricTypedDataBinding.inl rename to cortex-9.7.0/include/IECorePython/GeometricTypedDataBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/GradeBinding.h b/cortex-9.7.0/include/IECorePython/GradeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/GradeBinding.h rename to cortex-9.7.0/include/IECorePython/GradeBinding.h diff --git a/cortex-9.6.0/include/IECorePython/GroupBinding.h b/cortex-9.7.0/include/IECorePython/GroupBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/GroupBinding.h rename to cortex-9.7.0/include/IECorePython/GroupBinding.h diff --git a/cortex-9.6.0/include/IECorePython/HalfBinding.h b/cortex-9.7.0/include/IECorePython/HalfBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/HalfBinding.h rename to cortex-9.7.0/include/IECorePython/HalfBinding.h diff --git a/cortex-9.6.0/include/IECorePython/HdrMergeOpBinding.h b/cortex-9.7.0/include/IECorePython/HdrMergeOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/HdrMergeOpBinding.h rename to cortex-9.7.0/include/IECorePython/HdrMergeOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/HeaderGeneratorBinding.h b/cortex-9.7.0/include/IECorePython/HeaderGeneratorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/HeaderGeneratorBinding.h rename to cortex-9.7.0/include/IECorePython/HeaderGeneratorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/HenyeyGreensteinBinding.h b/cortex-9.7.0/include/IECorePython/HenyeyGreensteinBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/HenyeyGreensteinBinding.h rename to cortex-9.7.0/include/IECorePython/HenyeyGreensteinBinding.h diff --git a/cortex-9.6.0/include/IECorePython/HexConversionBinding.h b/cortex-9.7.0/include/IECorePython/HexConversionBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/HexConversionBinding.h rename to cortex-9.7.0/include/IECorePython/HexConversionBinding.h diff --git a/cortex-9.6.0/include/IECorePython/IECoreBinding.h b/cortex-9.7.0/include/IECorePython/IECoreBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/IECoreBinding.h rename to cortex-9.7.0/include/IECorePython/IECoreBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageCompositeOpBinding.h b/cortex-9.7.0/include/IECorePython/ImageCompositeOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageCompositeOpBinding.h rename to cortex-9.7.0/include/IECorePython/ImageCompositeOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageCropOpBinding.h b/cortex-9.7.0/include/IECorePython/ImageCropOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageCropOpBinding.h rename to cortex-9.7.0/include/IECorePython/ImageCropOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageDiffOpBinding.h b/cortex-9.7.0/include/IECorePython/ImageDiffOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageDiffOpBinding.h rename to cortex-9.7.0/include/IECorePython/ImageDiffOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageDisplayDriverBinding.h b/cortex-9.7.0/include/IECorePython/ImageDisplayDriverBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageDisplayDriverBinding.h rename to cortex-9.7.0/include/IECorePython/ImageDisplayDriverBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImagePremultiplyOpBinding.h b/cortex-9.7.0/include/IECorePython/ImagePremultiplyOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImagePremultiplyOpBinding.h rename to cortex-9.7.0/include/IECorePython/ImagePremultiplyOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImagePrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/ImagePrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImagePrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/ImagePrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImagePrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/ImagePrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImagePrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/ImagePrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/ImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/ImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageThinnerBinding.h b/cortex-9.7.0/include/IECorePython/ImageThinnerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageThinnerBinding.h rename to cortex-9.7.0/include/IECorePython/ImageThinnerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageUnpremultiplyOpBinding.h b/cortex-9.7.0/include/IECorePython/ImageUnpremultiplyOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageUnpremultiplyOpBinding.h rename to cortex-9.7.0/include/IECorePython/ImageUnpremultiplyOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/ImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/ImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathBinding.h b/cortex-9.7.0/include/IECorePython/ImathBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathBinding.h rename to cortex-9.7.0/include/IECorePython/ImathBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathBoxBinding.h b/cortex-9.7.0/include/IECorePython/ImathBoxBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathBoxBinding.h rename to cortex-9.7.0/include/IECorePython/ImathBoxBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathBoxVectorBinding.h b/cortex-9.7.0/include/IECorePython/ImathBoxVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathBoxVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathBoxVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathColorBinding.h b/cortex-9.7.0/include/IECorePython/ImathColorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathColorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathColorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathColorVectorBinding.h b/cortex-9.7.0/include/IECorePython/ImathColorVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathColorVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathColorVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathEulerBinding.h b/cortex-9.7.0/include/IECorePython/ImathEulerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathEulerBinding.h rename to cortex-9.7.0/include/IECorePython/ImathEulerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathMatrixBinding.h b/cortex-9.7.0/include/IECorePython/ImathMatrixBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathMatrixBinding.h rename to cortex-9.7.0/include/IECorePython/ImathMatrixBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathMatrixVectorBinding.h b/cortex-9.7.0/include/IECorePython/ImathMatrixVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathMatrixVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathMatrixVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathPlaneBinding.h b/cortex-9.7.0/include/IECorePython/ImathPlaneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathPlaneBinding.h rename to cortex-9.7.0/include/IECorePython/ImathPlaneBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathQuatBinding.h b/cortex-9.7.0/include/IECorePython/ImathQuatBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathQuatBinding.h rename to cortex-9.7.0/include/IECorePython/ImathQuatBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathQuatVectorBinding.h b/cortex-9.7.0/include/IECorePython/ImathQuatVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathQuatVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathQuatVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathRandomBinding.h b/cortex-9.7.0/include/IECorePython/ImathRandomBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathRandomBinding.h rename to cortex-9.7.0/include/IECorePython/ImathRandomBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathRootsBinding.h b/cortex-9.7.0/include/IECorePython/ImathRootsBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathRootsBinding.h rename to cortex-9.7.0/include/IECorePython/ImathRootsBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathVecBinding.h b/cortex-9.7.0/include/IECorePython/ImathVecBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathVecBinding.h rename to cortex-9.7.0/include/IECorePython/ImathVecBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImathVecVectorBinding.h b/cortex-9.7.0/include/IECorePython/ImathVecVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImathVecVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ImathVecVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImfBinding.h b/cortex-9.7.0/include/IECorePython/ImfBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImfBinding.h rename to cortex-9.7.0/include/IECorePython/ImfBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ImfTimeCodeBinding.h b/cortex-9.7.0/include/IECorePython/ImfTimeCodeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ImfTimeCodeBinding.h rename to cortex-9.7.0/include/IECorePython/ImfTimeCodeBinding.h diff --git a/cortex-9.6.0/include/IECorePython/IndexedIOBinding.h b/cortex-9.7.0/include/IECorePython/IndexedIOBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/IndexedIOBinding.h rename to cortex-9.7.0/include/IECorePython/IndexedIOBinding.h diff --git a/cortex-9.6.0/include/IECorePython/InternedStringBinding.h b/cortex-9.7.0/include/IECorePython/InternedStringBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/InternedStringBinding.h rename to cortex-9.7.0/include/IECorePython/InternedStringBinding.h diff --git a/cortex-9.6.0/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h b/cortex-9.7.0/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h rename to cortex-9.7.0/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h diff --git a/cortex-9.6.0/include/IECorePython/JPEGImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/JPEGImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/JPEGImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/JPEGImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/JPEGImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/JPEGImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/JPEGImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/JPEGImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/KDTreeBinding.h b/cortex-9.7.0/include/IECorePython/KDTreeBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/KDTreeBinding.h rename to cortex-9.7.0/include/IECorePython/KDTreeBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LRUCacheBinding.h b/cortex-9.7.0/include/IECorePython/LRUCacheBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LRUCacheBinding.h rename to cortex-9.7.0/include/IECorePython/LRUCacheBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LensDistortOpBinding.h b/cortex-9.7.0/include/IECorePython/LensDistortOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LensDistortOpBinding.h rename to cortex-9.7.0/include/IECorePython/LensDistortOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LensModelBinding.h b/cortex-9.7.0/include/IECorePython/LensModelBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LensModelBinding.h rename to cortex-9.7.0/include/IECorePython/LensModelBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LevenbergMarquardtBinding.h b/cortex-9.7.0/include/IECorePython/LevenbergMarquardtBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LevenbergMarquardtBinding.h rename to cortex-9.7.0/include/IECorePython/LevenbergMarquardtBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LightBinding.h b/cortex-9.7.0/include/IECorePython/LightBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LightBinding.h rename to cortex-9.7.0/include/IECorePython/LightBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h b/cortex-9.7.0/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h rename to cortex-9.7.0/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LineSegmentBinding.h b/cortex-9.7.0/include/IECorePython/LineSegmentBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LineSegmentBinding.h rename to cortex-9.7.0/include/IECorePython/LineSegmentBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinearToAlexaLogcOpBinding.h b/cortex-9.7.0/include/IECorePython/LinearToAlexaLogcOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinearToAlexaLogcOpBinding.h rename to cortex-9.7.0/include/IECorePython/LinearToAlexaLogcOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinearToCineonOpBinding.h b/cortex-9.7.0/include/IECorePython/LinearToCineonOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinearToCineonOpBinding.h rename to cortex-9.7.0/include/IECorePython/LinearToCineonOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinearToPanalogOpBinding.h b/cortex-9.7.0/include/IECorePython/LinearToPanalogOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinearToPanalogOpBinding.h rename to cortex-9.7.0/include/IECorePython/LinearToPanalogOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinearToRec709OpBinding.h b/cortex-9.7.0/include/IECorePython/LinearToRec709OpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinearToRec709OpBinding.h rename to cortex-9.7.0/include/IECorePython/LinearToRec709OpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinearToSRGBOpBinding.h b/cortex-9.7.0/include/IECorePython/LinearToSRGBOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinearToSRGBOpBinding.h rename to cortex-9.7.0/include/IECorePython/LinearToSRGBOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LinkedSceneBinding.h b/cortex-9.7.0/include/IECorePython/LinkedSceneBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LinkedSceneBinding.h rename to cortex-9.7.0/include/IECorePython/LinkedSceneBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LookupBinding.h b/cortex-9.7.0/include/IECorePython/LookupBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LookupBinding.h rename to cortex-9.7.0/include/IECorePython/LookupBinding.h diff --git a/cortex-9.6.0/include/IECorePython/LuminanceOpBinding.h b/cortex-9.7.0/include/IECorePython/LuminanceOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/LuminanceOpBinding.h rename to cortex-9.7.0/include/IECorePython/LuminanceOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MPlayDisplayDriverBinding.h b/cortex-9.7.0/include/IECorePython/MPlayDisplayDriverBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MPlayDisplayDriverBinding.h rename to cortex-9.7.0/include/IECorePython/MPlayDisplayDriverBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MathBinding.h b/cortex-9.7.0/include/IECorePython/MathBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MathBinding.h rename to cortex-9.7.0/include/IECorePython/MathBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MatrixMotionTransformBinding.h b/cortex-9.7.0/include/IECorePython/MatrixMotionTransformBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MatrixMotionTransformBinding.h rename to cortex-9.7.0/include/IECorePython/MatrixMotionTransformBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MatrixMultiplyOpBinding.h b/cortex-9.7.0/include/IECorePython/MatrixMultiplyOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MatrixMultiplyOpBinding.h rename to cortex-9.7.0/include/IECorePython/MatrixMultiplyOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MatrixTransformBinding.h b/cortex-9.7.0/include/IECorePython/MatrixTransformBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MatrixTransformBinding.h rename to cortex-9.7.0/include/IECorePython/MatrixTransformBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MedianCutSamplerBinding.h b/cortex-9.7.0/include/IECorePython/MedianCutSamplerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MedianCutSamplerBinding.h rename to cortex-9.7.0/include/IECorePython/MedianCutSamplerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshDistortionsOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshDistortionsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshDistortionsOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshDistortionsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshFaceFilterOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshFaceFilterOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshFaceFilterOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshFaceFilterOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshMergeOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshMergeOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshMergeOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshMergeOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshNormalsOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshNormalsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshNormalsOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshNormalsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/MeshPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/MeshPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshPrimitiveBuilderBinding.h b/cortex-9.7.0/include/IECorePython/MeshPrimitiveBuilderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshPrimitiveBuilderBinding.h rename to cortex-9.7.0/include/IECorePython/MeshPrimitiveBuilderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshPrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/MeshPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshPrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/MeshPrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshTangentsOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshTangentsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshTangentsOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshTangentsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MeshVertexReorderOpBinding.h b/cortex-9.7.0/include/IECorePython/MeshVertexReorderOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MeshVertexReorderOpBinding.h rename to cortex-9.7.0/include/IECorePython/MeshVertexReorderOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MessageHandlerBinding.h b/cortex-9.7.0/include/IECorePython/MessageHandlerBinding.h similarity index 97% rename from cortex-9.6.0/include/IECorePython/MessageHandlerBinding.h rename to cortex-9.7.0/include/IECorePython/MessageHandlerBinding.h index e8b7db4011..cb49497bdb 100644 --- a/cortex-9.6.0/include/IECorePython/MessageHandlerBinding.h +++ b/cortex-9.7.0/include/IECorePython/MessageHandlerBinding.h @@ -35,8 +35,6 @@ #ifndef IECOREPYTHON_MESSAGEHANDLERBINDING_H #define IECOREPYTHON_MESSAGEHANDLERBINDING_H -#include -#include "IECore/MessageHandler.h" #include "IECorePython/Export.h" namespace IECorePython diff --git a/cortex-9.6.0/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h b/cortex-9.7.0/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h rename to cortex-9.7.0/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ModifyOpBinding.h b/cortex-9.7.0/include/IECorePython/ModifyOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ModifyOpBinding.h rename to cortex-9.7.0/include/IECorePython/ModifyOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MotionPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/MotionPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MotionPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/MotionPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/MurmurHashBinding.h b/cortex-9.7.0/include/IECorePython/MurmurHashBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/MurmurHashBinding.h rename to cortex-9.7.0/include/IECorePython/MurmurHashBinding.h diff --git a/cortex-9.6.0/include/IECorePython/NParticleReaderBinding.h b/cortex-9.7.0/include/IECorePython/NParticleReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/NParticleReaderBinding.h rename to cortex-9.7.0/include/IECorePython/NParticleReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/NURBSPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/NURBSPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/NURBSPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/NURBSPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h b/cortex-9.7.0/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h rename to cortex-9.7.0/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/NullObjectBinding.h b/cortex-9.7.0/include/IECorePython/NullObjectBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/NullObjectBinding.h rename to cortex-9.7.0/include/IECorePython/NullObjectBinding.h diff --git a/cortex-9.6.0/include/IECorePython/NumericParameterBinding.h b/cortex-9.7.0/include/IECorePython/NumericParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/NumericParameterBinding.h rename to cortex-9.7.0/include/IECorePython/NumericParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/OBJReaderBinding.h b/cortex-9.7.0/include/IECorePython/OBJReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/OBJReaderBinding.h rename to cortex-9.7.0/include/IECorePython/OBJReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectBinding.h b/cortex-9.7.0/include/IECorePython/ObjectBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectInterpolatorBinding.h b/cortex-9.7.0/include/IECorePython/ObjectInterpolatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectInterpolatorBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectInterpolatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectParameterBinding.h b/cortex-9.7.0/include/IECorePython/ObjectParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectParameterBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectPoolBinding.h b/cortex-9.7.0/include/IECorePython/ObjectPoolBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectPoolBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectPoolBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectReaderBinding.h b/cortex-9.7.0/include/IECorePython/ObjectReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectReaderBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectVectorBinding.h b/cortex-9.7.0/include/IECorePython/ObjectVectorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectVectorBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectVectorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ObjectWriterBinding.h b/cortex-9.7.0/include/IECorePython/ObjectWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ObjectWriterBinding.h rename to cortex-9.7.0/include/IECorePython/ObjectWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/OpBinding.h b/cortex-9.7.0/include/IECorePython/OpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/OpBinding.h rename to cortex-9.7.0/include/IECorePython/OpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/OptionsBinding.h b/cortex-9.7.0/include/IECorePython/OptionsBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/OptionsBinding.h rename to cortex-9.7.0/include/IECorePython/OptionsBinding.h diff --git a/cortex-9.6.0/include/IECorePython/OversamplesCalculatorBinding.h b/cortex-9.7.0/include/IECorePython/OversamplesCalculatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/OversamplesCalculatorBinding.h rename to cortex-9.7.0/include/IECorePython/OversamplesCalculatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PDCParticleReaderBinding.h b/cortex-9.7.0/include/IECorePython/PDCParticleReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PDCParticleReaderBinding.h rename to cortex-9.7.0/include/IECorePython/PDCParticleReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PDCParticleWriterBinding.h b/cortex-9.7.0/include/IECorePython/PDCParticleWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PDCParticleWriterBinding.h rename to cortex-9.7.0/include/IECorePython/PDCParticleWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PNGImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/PNGImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PNGImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/PNGImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PanalogToLinearOpBinding.h b/cortex-9.7.0/include/IECorePython/PanalogToLinearOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PanalogToLinearOpBinding.h rename to cortex-9.7.0/include/IECorePython/PanalogToLinearOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ParameterBinding.h b/cortex-9.7.0/include/IECorePython/ParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParameterBinding.h rename to cortex-9.7.0/include/IECorePython/ParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ParameterBinding.inl b/cortex-9.7.0/include/IECorePython/ParameterBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParameterBinding.inl rename to cortex-9.7.0/include/IECorePython/ParameterBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/ParameterisedBinding.h b/cortex-9.7.0/include/IECorePython/ParameterisedBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParameterisedBinding.h rename to cortex-9.7.0/include/IECorePython/ParameterisedBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ParameterisedProceduralBinding.h b/cortex-9.7.0/include/IECorePython/ParameterisedProceduralBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParameterisedProceduralBinding.h rename to cortex-9.7.0/include/IECorePython/ParameterisedProceduralBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ParticleReaderBinding.h b/cortex-9.7.0/include/IECorePython/ParticleReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParticleReaderBinding.h rename to cortex-9.7.0/include/IECorePython/ParticleReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ParticleWriterBinding.h b/cortex-9.7.0/include/IECorePython/ParticleWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ParticleWriterBinding.h rename to cortex-9.7.0/include/IECorePython/ParticleWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PatchMeshPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/PatchMeshPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PatchMeshPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/PatchMeshPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PathParameterBinding.h b/cortex-9.7.0/include/IECorePython/PathParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PathParameterBinding.h rename to cortex-9.7.0/include/IECorePython/PathParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PathVectorParameterBinding.h b/cortex-9.7.0/include/IECorePython/PathVectorParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PathVectorParameterBinding.h rename to cortex-9.7.0/include/IECorePython/PathVectorParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PerlinNoiseBinding.h b/cortex-9.7.0/include/IECorePython/PerlinNoiseBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PerlinNoiseBinding.h rename to cortex-9.7.0/include/IECorePython/PerlinNoiseBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointBoundsOpBinding.h b/cortex-9.7.0/include/IECorePython/PointBoundsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointBoundsOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointBoundsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointDensitiesOpBinding.h b/cortex-9.7.0/include/IECorePython/PointDensitiesOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointDensitiesOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointDensitiesOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointDistributionBinding.h b/cortex-9.7.0/include/IECorePython/PointDistributionBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointDistributionBinding.h rename to cortex-9.7.0/include/IECorePython/PointDistributionBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointDistributionOpBinding.h b/cortex-9.7.0/include/IECorePython/PointDistributionOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointDistributionOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointDistributionOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointNormalsOpBinding.h b/cortex-9.7.0/include/IECorePython/PointNormalsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointNormalsOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointNormalsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointRepulsionOpBinding.h b/cortex-9.7.0/include/IECorePython/PointRepulsionOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointRepulsionOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointRepulsionOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointSmoothSkinningOpBinding.h b/cortex-9.7.0/include/IECorePython/PointSmoothSkinningOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointSmoothSkinningOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointSmoothSkinningOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointVelocityDisplaceOpBinding.h b/cortex-9.7.0/include/IECorePython/PointVelocityDisplaceOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointVelocityDisplaceOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointVelocityDisplaceOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointerFromSWIG.h b/cortex-9.7.0/include/IECorePython/PointerFromSWIG.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointerFromSWIG.h rename to cortex-9.7.0/include/IECorePython/PointerFromSWIG.h diff --git a/cortex-9.6.0/include/IECorePython/PointerFromSWIG.inl b/cortex-9.7.0/include/IECorePython/PointerFromSWIG.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointerFromSWIG.inl rename to cortex-9.7.0/include/IECorePython/PointerFromSWIG.inl diff --git a/cortex-9.6.0/include/IECorePython/PointsMotionOpBinding.h b/cortex-9.7.0/include/IECorePython/PointsMotionOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointsMotionOpBinding.h rename to cortex-9.7.0/include/IECorePython/PointsMotionOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointsPrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/PointsPrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointsPrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/PointsPrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PointsPrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/PointsPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PointsPrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/PointsPrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PolygonAlgoBinding.h b/cortex-9.7.0/include/IECorePython/PolygonAlgoBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PolygonAlgoBinding.h rename to cortex-9.7.0/include/IECorePython/PolygonAlgoBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PreWorldRenderableBinding.h b/cortex-9.7.0/include/IECorePython/PreWorldRenderableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PreWorldRenderableBinding.h rename to cortex-9.7.0/include/IECorePython/PreWorldRenderableBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/PrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/PrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/PrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/PrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PrimitiveOpBinding.h b/cortex-9.7.0/include/IECorePython/PrimitiveOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PrimitiveOpBinding.h rename to cortex-9.7.0/include/IECorePython/PrimitiveOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/PrimitiveVariableBinding.h b/cortex-9.7.0/include/IECorePython/PrimitiveVariableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/PrimitiveVariableBinding.h rename to cortex-9.7.0/include/IECorePython/PrimitiveVariableBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RadixSortBinding.h b/cortex-9.7.0/include/IECorePython/RadixSortBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RadixSortBinding.h rename to cortex-9.7.0/include/IECorePython/RadixSortBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RandomRotationOpBinding.h b/cortex-9.7.0/include/IECorePython/RandomRotationOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RandomRotationOpBinding.h rename to cortex-9.7.0/include/IECorePython/RandomRotationOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ReaderBinding.h b/cortex-9.7.0/include/IECorePython/ReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ReaderBinding.h rename to cortex-9.7.0/include/IECorePython/ReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/Rec709ToLinearOpBinding.h b/cortex-9.7.0/include/IECorePython/Rec709ToLinearOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/Rec709ToLinearOpBinding.h rename to cortex-9.7.0/include/IECorePython/Rec709ToLinearOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RefCountedBinding.h b/cortex-9.7.0/include/IECorePython/RefCountedBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RefCountedBinding.h rename to cortex-9.7.0/include/IECorePython/RefCountedBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RefCountedBinding.inl b/cortex-9.7.0/include/IECorePython/RefCountedBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/RefCountedBinding.inl rename to cortex-9.7.0/include/IECorePython/RefCountedBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h b/cortex-9.7.0/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h rename to cortex-9.7.0/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RenderableBinding.h b/cortex-9.7.0/include/IECorePython/RenderableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RenderableBinding.h rename to cortex-9.7.0/include/IECorePython/RenderableBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RendererBinding.h b/cortex-9.7.0/include/IECorePython/RendererBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RendererBinding.h rename to cortex-9.7.0/include/IECorePython/RendererBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h b/cortex-9.7.0/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h rename to cortex-9.7.0/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ReorderedFrameListBinding.h b/cortex-9.7.0/include/IECorePython/ReorderedFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ReorderedFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/ReorderedFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ReversedFrameListBinding.h b/cortex-9.7.0/include/IECorePython/ReversedFrameListBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ReversedFrameListBinding.h rename to cortex-9.7.0/include/IECorePython/ReversedFrameListBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RunTimeTypedBinding.h b/cortex-9.7.0/include/IECorePython/RunTimeTypedBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/RunTimeTypedBinding.h rename to cortex-9.7.0/include/IECorePython/RunTimeTypedBinding.h diff --git a/cortex-9.6.0/include/IECorePython/RunTimeTypedBinding.inl b/cortex-9.7.0/include/IECorePython/RunTimeTypedBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/RunTimeTypedBinding.inl rename to cortex-9.7.0/include/IECorePython/RunTimeTypedBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/SGIImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/SGIImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SGIImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/SGIImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SRGBToLinearOpBinding.h b/cortex-9.7.0/include/IECorePython/SRGBToLinearOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SRGBToLinearOpBinding.h rename to cortex-9.7.0/include/IECorePython/SRGBToLinearOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SampledSceneInterfaceBinding.h b/cortex-9.7.0/include/IECorePython/SampledSceneInterfaceBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SampledSceneInterfaceBinding.h rename to cortex-9.7.0/include/IECorePython/SampledSceneInterfaceBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SceneCacheBinding.h b/cortex-9.7.0/include/IECorePython/SceneCacheBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SceneCacheBinding.h rename to cortex-9.7.0/include/IECorePython/SceneCacheBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SceneInterfaceBinding.h b/cortex-9.7.0/include/IECorePython/SceneInterfaceBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SceneInterfaceBinding.h rename to cortex-9.7.0/include/IECorePython/SceneInterfaceBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ScopedGILLock.h b/cortex-9.7.0/include/IECorePython/ScopedGILLock.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ScopedGILLock.h rename to cortex-9.7.0/include/IECorePython/ScopedGILLock.h diff --git a/cortex-9.6.0/include/IECorePython/ScopedGILRelease.h b/cortex-9.7.0/include/IECorePython/ScopedGILRelease.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ScopedGILRelease.h rename to cortex-9.7.0/include/IECorePython/ScopedGILRelease.h diff --git a/cortex-9.6.0/include/IECorePython/SearchPathBinding.h b/cortex-9.7.0/include/IECorePython/SearchPathBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SearchPathBinding.h rename to cortex-9.7.0/include/IECorePython/SearchPathBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ShaderBinding.h b/cortex-9.7.0/include/IECorePython/ShaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ShaderBinding.h rename to cortex-9.7.0/include/IECorePython/ShaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SharedSceneInterfacesBinding.h b/cortex-9.7.0/include/IECorePython/SharedSceneInterfacesBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SharedSceneInterfacesBinding.h rename to cortex-9.7.0/include/IECorePython/SharedSceneInterfacesBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SimpleTypedDataBinding.h b/cortex-9.7.0/include/IECorePython/SimpleTypedDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SimpleTypedDataBinding.h rename to cortex-9.7.0/include/IECorePython/SimpleTypedDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SimpleTypedDataBinding.inl b/cortex-9.7.0/include/IECorePython/SimpleTypedDataBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/SimpleTypedDataBinding.inl rename to cortex-9.7.0/include/IECorePython/SimpleTypedDataBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/SimpleTypedParameterBinding.h b/cortex-9.7.0/include/IECorePython/SimpleTypedParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SimpleTypedParameterBinding.h rename to cortex-9.7.0/include/IECorePython/SimpleTypedParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SmoothSkinningDataBinding.h b/cortex-9.7.0/include/IECorePython/SmoothSkinningDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SmoothSkinningDataBinding.h rename to cortex-9.7.0/include/IECorePython/SmoothSkinningDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h b/cortex-9.7.0/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h rename to cortex-9.7.0/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SpherePrimitiveBinding.h b/cortex-9.7.0/include/IECorePython/SpherePrimitiveBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SpherePrimitiveBinding.h rename to cortex-9.7.0/include/IECorePython/SpherePrimitiveBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SpherePrimitiveEvaluatorBinding.h b/cortex-9.7.0/include/IECorePython/SpherePrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SpherePrimitiveEvaluatorBinding.h rename to cortex-9.7.0/include/IECorePython/SpherePrimitiveEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SplineBinding.h b/cortex-9.7.0/include/IECorePython/SplineBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SplineBinding.h rename to cortex-9.7.0/include/IECorePython/SplineBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SplineDataBinding.h b/cortex-9.7.0/include/IECorePython/SplineDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SplineDataBinding.h rename to cortex-9.7.0/include/IECorePython/SplineDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SplineParameterBinding.h b/cortex-9.7.0/include/IECorePython/SplineParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SplineParameterBinding.h rename to cortex-9.7.0/include/IECorePython/SplineParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SplineToImageBinding.h b/cortex-9.7.0/include/IECorePython/SplineToImageBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SplineToImageBinding.h rename to cortex-9.7.0/include/IECorePython/SplineToImageBinding.h diff --git a/cortex-9.6.0/include/IECorePython/StandardRadialLensModelBinding.h b/cortex-9.7.0/include/IECorePython/StandardRadialLensModelBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/StandardRadialLensModelBinding.h rename to cortex-9.7.0/include/IECorePython/StandardRadialLensModelBinding.h diff --git a/cortex-9.6.0/include/IECorePython/StateRenderableBinding.h b/cortex-9.7.0/include/IECorePython/StateRenderableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/StateRenderableBinding.h rename to cortex-9.7.0/include/IECorePython/StateRenderableBinding.h diff --git a/cortex-9.6.0/include/IECorePython/SummedAreaOpBinding.h b/cortex-9.7.0/include/IECorePython/SummedAreaOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/SummedAreaOpBinding.h rename to cortex-9.7.0/include/IECorePython/SummedAreaOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TGAImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/TGAImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TGAImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/TGAImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TGAImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/TGAImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TGAImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/TGAImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TIFFImageReaderBinding.h b/cortex-9.7.0/include/IECorePython/TIFFImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TIFFImageReaderBinding.h rename to cortex-9.7.0/include/IECorePython/TIFFImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TIFFImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/TIFFImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TIFFImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/TIFFImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimeCodeDataBinding.h b/cortex-9.7.0/include/IECorePython/TimeCodeDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimeCodeDataBinding.h rename to cortex-9.7.0/include/IECorePython/TimeCodeDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimeCodeParameterBinding.h b/cortex-9.7.0/include/IECorePython/TimeCodeParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimeCodeParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TimeCodeParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimeDurationDataBinding.h b/cortex-9.7.0/include/IECorePython/TimeDurationDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimeDurationDataBinding.h rename to cortex-9.7.0/include/IECorePython/TimeDurationDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimeDurationParameterBinding.h b/cortex-9.7.0/include/IECorePython/TimeDurationParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimeDurationParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TimeDurationParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimePeriodBinding.h b/cortex-9.7.0/include/IECorePython/TimePeriodBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimePeriodBinding.h rename to cortex-9.7.0/include/IECorePython/TimePeriodBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimePeriodDataBinding.h b/cortex-9.7.0/include/IECorePython/TimePeriodDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimePeriodDataBinding.h rename to cortex-9.7.0/include/IECorePython/TimePeriodDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimePeriodParameterBinding.h b/cortex-9.7.0/include/IECorePython/TimePeriodParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimePeriodParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TimePeriodParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TimerBinding.h b/cortex-9.7.0/include/IECorePython/TimerBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TimerBinding.h rename to cortex-9.7.0/include/IECorePython/TimerBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ToCoreConverterBinding.h b/cortex-9.7.0/include/IECorePython/ToCoreConverterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ToCoreConverterBinding.h rename to cortex-9.7.0/include/IECorePython/ToCoreConverterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h b/cortex-9.7.0/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h rename to cortex-9.7.0/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TransformBinding.h b/cortex-9.7.0/include/IECorePython/TransformBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TransformBinding.h rename to cortex-9.7.0/include/IECorePython/TransformBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TransformOpBinding.h b/cortex-9.7.0/include/IECorePython/TransformOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TransformOpBinding.h rename to cortex-9.7.0/include/IECorePython/TransformOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TransformationMatrixBinding.h b/cortex-9.7.0/include/IECorePython/TransformationMatrixBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TransformationMatrixBinding.h rename to cortex-9.7.0/include/IECorePython/TransformationMatrixBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TransformationMatrixDataBinding.h b/cortex-9.7.0/include/IECorePython/TransformationMatrixDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TransformationMatrixDataBinding.h rename to cortex-9.7.0/include/IECorePython/TransformationMatrixDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TriangleAlgoBinding.h b/cortex-9.7.0/include/IECorePython/TriangleAlgoBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TriangleAlgoBinding.h rename to cortex-9.7.0/include/IECorePython/TriangleAlgoBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TriangulateOpBinding.h b/cortex-9.7.0/include/IECorePython/TriangulateOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TriangulateOpBinding.h rename to cortex-9.7.0/include/IECorePython/TriangulateOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TriangulatorBinding.h b/cortex-9.7.0/include/IECorePython/TriangulatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TriangulatorBinding.h rename to cortex-9.7.0/include/IECorePython/TriangulatorBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TurbulenceBinding.h b/cortex-9.7.0/include/IECorePython/TurbulenceBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TurbulenceBinding.h rename to cortex-9.7.0/include/IECorePython/TurbulenceBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TypeIdBinding.h b/cortex-9.7.0/include/IECorePython/TypeIdBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypeIdBinding.h rename to cortex-9.7.0/include/IECorePython/TypeIdBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TypedObjectParameterBinding.h b/cortex-9.7.0/include/IECorePython/TypedObjectParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedObjectParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TypedObjectParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TypedObjectParameterBinding.inl b/cortex-9.7.0/include/IECorePython/TypedObjectParameterBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedObjectParameterBinding.inl rename to cortex-9.7.0/include/IECorePython/TypedObjectParameterBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/TypedParameterBinding.h b/cortex-9.7.0/include/IECorePython/TypedParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TypedParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TypedParameterBinding.inl b/cortex-9.7.0/include/IECorePython/TypedParameterBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedParameterBinding.inl rename to cortex-9.7.0/include/IECorePython/TypedParameterBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/TypedPrimitiveOpBinding.h b/cortex-9.7.0/include/IECorePython/TypedPrimitiveOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedPrimitiveOpBinding.h rename to cortex-9.7.0/include/IECorePython/TypedPrimitiveOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/TypedPrimitiveParameterBinding.h b/cortex-9.7.0/include/IECorePython/TypedPrimitiveParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/TypedPrimitiveParameterBinding.h rename to cortex-9.7.0/include/IECorePython/TypedPrimitiveParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/UVDistortOpBinding.h b/cortex-9.7.0/include/IECorePython/UVDistortOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/UVDistortOpBinding.h rename to cortex-9.7.0/include/IECorePython/UVDistortOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/UnicodeToStringBinding.h b/cortex-9.7.0/include/IECorePython/UnicodeToStringBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/UnicodeToStringBinding.h rename to cortex-9.7.0/include/IECorePython/UnicodeToStringBinding.h diff --git a/cortex-9.6.0/include/IECorePython/ValidatedStringParameterBinding.h b/cortex-9.7.0/include/IECorePython/ValidatedStringParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/ValidatedStringParameterBinding.h rename to cortex-9.7.0/include/IECorePython/ValidatedStringParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/VectorDataFilterOpBinding.h b/cortex-9.7.0/include/IECorePython/VectorDataFilterOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/VectorDataFilterOpBinding.h rename to cortex-9.7.0/include/IECorePython/VectorDataFilterOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/VectorTypedDataBinding.h b/cortex-9.7.0/include/IECorePython/VectorTypedDataBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/VectorTypedDataBinding.h rename to cortex-9.7.0/include/IECorePython/VectorTypedDataBinding.h diff --git a/cortex-9.6.0/include/IECorePython/VectorTypedDataBinding.inl b/cortex-9.7.0/include/IECorePython/VectorTypedDataBinding.inl similarity index 100% rename from cortex-9.6.0/include/IECorePython/VectorTypedDataBinding.inl rename to cortex-9.7.0/include/IECorePython/VectorTypedDataBinding.inl diff --git a/cortex-9.6.0/include/IECorePython/VectorTypedParameterBinding.h b/cortex-9.7.0/include/IECorePython/VectorTypedParameterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/VectorTypedParameterBinding.h rename to cortex-9.7.0/include/IECorePython/VectorTypedParameterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/VisibleRenderableBinding.h b/cortex-9.7.0/include/IECorePython/VisibleRenderableBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/VisibleRenderableBinding.h rename to cortex-9.7.0/include/IECorePython/VisibleRenderableBinding.h diff --git a/cortex-9.6.0/include/IECorePython/WarpOpBinding.h b/cortex-9.7.0/include/IECorePython/WarpOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/WarpOpBinding.h rename to cortex-9.7.0/include/IECorePython/WarpOpBinding.h diff --git a/cortex-9.6.0/include/IECorePython/Wrapper.h b/cortex-9.7.0/include/IECorePython/Wrapper.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/Wrapper.h rename to cortex-9.7.0/include/IECorePython/Wrapper.h diff --git a/cortex-9.6.0/include/IECorePython/WrapperGarbageCollector.h b/cortex-9.7.0/include/IECorePython/WrapperGarbageCollector.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/WrapperGarbageCollector.h rename to cortex-9.7.0/include/IECorePython/WrapperGarbageCollector.h diff --git a/cortex-9.6.0/include/IECorePython/WriterBinding.h b/cortex-9.7.0/include/IECorePython/WriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/WriterBinding.h rename to cortex-9.7.0/include/IECorePython/WriterBinding.h diff --git a/cortex-9.6.0/include/IECorePython/YUVImageWriterBinding.h b/cortex-9.7.0/include/IECorePython/YUVImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECorePython/YUVImageWriterBinding.h rename to cortex-9.7.0/include/IECorePython/YUVImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/Convert.h b/cortex-9.7.0/include/IECoreRI/Convert.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/Convert.h rename to cortex-9.7.0/include/IECoreRI/Convert.h diff --git a/cortex-9.6.0/include/IECoreRI/DTEXDeepImageReader.h b/cortex-9.7.0/include/IECoreRI/DTEXDeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/DTEXDeepImageReader.h rename to cortex-9.7.0/include/IECoreRI/DTEXDeepImageReader.h diff --git a/cortex-9.6.0/include/IECoreRI/DTEXDeepImageWriter.h b/cortex-9.7.0/include/IECoreRI/DTEXDeepImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/DTEXDeepImageWriter.h rename to cortex-9.7.0/include/IECoreRI/DTEXDeepImageWriter.h diff --git a/cortex-9.6.0/include/IECoreRI/Dspy.h b/cortex-9.7.0/include/IECoreRI/Dspy.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/Dspy.h rename to cortex-9.7.0/include/IECoreRI/Dspy.h diff --git a/cortex-9.6.0/include/IECoreRI/Export.h b/cortex-9.7.0/include/IECoreRI/Export.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/Export.h rename to cortex-9.7.0/include/IECoreRI/Export.h diff --git a/cortex-9.6.0/include/IECoreRI/GXEvaluator.h b/cortex-9.7.0/include/IECoreRI/GXEvaluator.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/GXEvaluator.h rename to cortex-9.7.0/include/IECoreRI/GXEvaluator.h diff --git a/cortex-9.6.0/include/IECoreRI/IECoreRI.h b/cortex-9.7.0/include/IECoreRI/IECoreRI.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/IECoreRI.h rename to cortex-9.7.0/include/IECoreRI/IECoreRI.h diff --git a/cortex-9.6.0/include/IECoreRI/PTCParticleIO.h b/cortex-9.7.0/include/IECoreRI/PTCParticleIO.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/PTCParticleIO.h rename to cortex-9.7.0/include/IECoreRI/PTCParticleIO.h diff --git a/cortex-9.6.0/include/IECoreRI/PTCParticleReader.h b/cortex-9.7.0/include/IECoreRI/PTCParticleReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/PTCParticleReader.h rename to cortex-9.7.0/include/IECoreRI/PTCParticleReader.h diff --git a/cortex-9.6.0/include/IECoreRI/PTCParticleWriter.h b/cortex-9.7.0/include/IECoreRI/PTCParticleWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/PTCParticleWriter.h rename to cortex-9.7.0/include/IECoreRI/PTCParticleWriter.h diff --git a/cortex-9.6.0/include/IECoreRI/ParameterList.h b/cortex-9.7.0/include/IECoreRI/ParameterList.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/ParameterList.h rename to cortex-9.7.0/include/IECoreRI/ParameterList.h diff --git a/cortex-9.6.0/include/IECoreRI/PrimitiveVariableList.h b/cortex-9.7.0/include/IECoreRI/PrimitiveVariableList.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/PrimitiveVariableList.h rename to cortex-9.7.0/include/IECoreRI/PrimitiveVariableList.h diff --git a/cortex-9.6.0/include/IECoreRI/RIBWriter.h b/cortex-9.7.0/include/IECoreRI/RIBWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/RIBWriter.h rename to cortex-9.7.0/include/IECoreRI/RIBWriter.h diff --git a/cortex-9.6.0/include/IECoreRI/Renderer.h b/cortex-9.7.0/include/IECoreRI/Renderer.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/Renderer.h rename to cortex-9.7.0/include/IECoreRI/Renderer.h diff --git a/cortex-9.6.0/include/IECoreRI/SHWDeepImageReader.h b/cortex-9.7.0/include/IECoreRI/SHWDeepImageReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SHWDeepImageReader.h rename to cortex-9.7.0/include/IECoreRI/SHWDeepImageReader.h diff --git a/cortex-9.6.0/include/IECoreRI/SHWDeepImageWriter.h b/cortex-9.7.0/include/IECoreRI/SHWDeepImageWriter.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SHWDeepImageWriter.h rename to cortex-9.7.0/include/IECoreRI/SHWDeepImageWriter.h diff --git a/cortex-9.6.0/include/IECoreRI/SLOReader.h b/cortex-9.7.0/include/IECoreRI/SLOReader.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SLOReader.h rename to cortex-9.7.0/include/IECoreRI/SLOReader.h diff --git a/cortex-9.6.0/include/IECoreRI/SXExecutor.h b/cortex-9.7.0/include/IECoreRI/SXExecutor.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SXExecutor.h rename to cortex-9.7.0/include/IECoreRI/SXExecutor.h diff --git a/cortex-9.6.0/include/IECoreRI/SXRenderer.h b/cortex-9.7.0/include/IECoreRI/SXRenderer.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SXRenderer.h rename to cortex-9.7.0/include/IECoreRI/SXRenderer.h diff --git a/cortex-9.6.0/include/IECoreRI/SXTypeTraits.h b/cortex-9.7.0/include/IECoreRI/SXTypeTraits.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/SXTypeTraits.h rename to cortex-9.7.0/include/IECoreRI/SXTypeTraits.h diff --git a/cortex-9.6.0/include/IECoreRI/ScopedContext.h b/cortex-9.7.0/include/IECoreRI/ScopedContext.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/ScopedContext.h rename to cortex-9.7.0/include/IECoreRI/ScopedContext.h diff --git a/cortex-9.6.0/include/IECoreRI/TypeIds.h b/cortex-9.7.0/include/IECoreRI/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/TypeIds.h rename to cortex-9.7.0/include/IECoreRI/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/GXEvaluatorBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/GXEvaluatorBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/GXEvaluatorBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/GXEvaluatorBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/PTCParticleReaderBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/PTCParticleReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/PTCParticleReaderBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/PTCParticleReaderBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/PTCParticleWriterBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/PTCParticleWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/PTCParticleWriterBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/PTCParticleWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/RIBWriterBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/RIBWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/RIBWriterBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/RIBWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/RendererBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/RendererBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/RendererBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/RendererBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/SLOReaderBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/SLOReaderBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/SLOReaderBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/SLOReaderBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/bindings/SXRendererBinding.h b/cortex-9.7.0/include/IECoreRI/bindings/SXRendererBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/bindings/SXRendererBinding.h rename to cortex-9.7.0/include/IECoreRI/bindings/SXRendererBinding.h diff --git a/cortex-9.6.0/include/IECoreRI/private/RendererImplementation.h b/cortex-9.7.0/include/IECoreRI/private/RendererImplementation.h similarity index 99% rename from cortex-9.6.0/include/IECoreRI/private/RendererImplementation.h rename to cortex-9.7.0/include/IECoreRI/private/RendererImplementation.h index b3f8582ac5..e95009c9cb 100644 --- a/cortex-9.6.0/include/IECoreRI/private/RendererImplementation.h +++ b/cortex-9.7.0/include/IECoreRI/private/RendererImplementation.h @@ -54,11 +54,10 @@ #include "IECore/SpherePrimitive.h" #include "IECore/NURBSPrimitive.h" #include "IECore/PatchMeshPrimitive.h" +#include "IECore/private/TransformStack.h" #include "IECoreRI/Export.h" - #include "IECoreRI/Renderer.h" -#include "IECoreRI/private/TransformStack.h" namespace IECoreRI { @@ -193,7 +192,7 @@ class IECORERI_API RendererImplementation : public IECore::Renderer // Before RiWorldBegin we have to track the transform // ourselves (because we must invert cortex camera // transforms to get renderman camera transforms). - TransformStack m_preWorldTransform; + IECore::TransformStack m_preWorldTransform; size_t m_numDisplays; std::string m_lastCamera; bool m_inWorld; diff --git a/cortex-9.6.0/include/IECoreRI/private/SXRendererImplementation.h b/cortex-9.7.0/include/IECoreRI/private/SXRendererImplementation.h similarity index 100% rename from cortex-9.6.0/include/IECoreRI/private/SXRendererImplementation.h rename to cortex-9.7.0/include/IECoreRI/private/SXRendererImplementation.h diff --git a/cortex-9.6.0/include/IECoreTruelight/IECoreTruelight.h b/cortex-9.7.0/include/IECoreTruelight/IECoreTruelight.h similarity index 100% rename from cortex-9.6.0/include/IECoreTruelight/IECoreTruelight.h rename to cortex-9.7.0/include/IECoreTruelight/IECoreTruelight.h diff --git a/cortex-9.6.0/include/IECoreTruelight/TruelightColorTransformOp.h b/cortex-9.7.0/include/IECoreTruelight/TruelightColorTransformOp.h similarity index 100% rename from cortex-9.6.0/include/IECoreTruelight/TruelightColorTransformOp.h rename to cortex-9.7.0/include/IECoreTruelight/TruelightColorTransformOp.h diff --git a/cortex-9.6.0/include/IECoreTruelight/TypeIds.h b/cortex-9.7.0/include/IECoreTruelight/TypeIds.h similarity index 100% rename from cortex-9.6.0/include/IECoreTruelight/TypeIds.h rename to cortex-9.7.0/include/IECoreTruelight/TypeIds.h diff --git a/cortex-9.6.0/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h b/cortex-9.7.0/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h similarity index 100% rename from cortex-9.6.0/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h rename to cortex-9.7.0/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h diff --git a/cortex-9.6.0/mel/IECoreMaya/IECoreMaya.mel b/cortex-9.7.0/mel/IECoreMaya/IECoreMaya.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/IECoreMaya.mel rename to cortex-9.7.0/mel/IECoreMaya/IECoreMaya.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieAttr.mel b/cortex-9.7.0/mel/IECoreMaya/ieAttr.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieAttr.mel rename to cortex-9.7.0/mel/IECoreMaya/ieAttr.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieAttributeEditorControl.mel b/cortex-9.7.0/mel/IECoreMaya/ieAttributeEditorControl.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieAttributeEditorControl.mel rename to cortex-9.7.0/mel/IECoreMaya/ieAttributeEditorControl.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieConverterHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieConverterHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieConverterHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieConverterHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieCurveCombinerUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieCurveCombinerUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieCurveCombinerUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieCurveCombinerUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieDLUserGeoTypes.mel b/cortex-9.7.0/mel/IECoreMaya/ieDLUserGeoTypes.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieDLUserGeoTypes.mel rename to cortex-9.7.0/mel/IECoreMaya/ieDLUserGeoTypes.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieDrawableHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieDrawableHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieDrawableHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieDrawableHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieGeometryCombinerUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieGeometryCombinerUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieGeometryCombinerUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieGeometryCombinerUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieImagePlaneHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieImagePlaneHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieImagePlaneHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieImagePlaneHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieNode.mel b/cortex-9.7.0/mel/IECoreMaya/ieNode.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieNode.mel rename to cortex-9.7.0/mel/IECoreMaya/ieNode.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieOpHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieOpHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieOpHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieOpHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/iePanel.mel b/cortex-9.7.0/mel/IECoreMaya/iePanel.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/iePanel.mel rename to cortex-9.7.0/mel/IECoreMaya/iePanel.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieParameterPanel.mel b/cortex-9.7.0/mel/IECoreMaya/ieParameterPanel.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieParameterPanel.mel rename to cortex-9.7.0/mel/IECoreMaya/ieParameterPanel.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolder.mel b/cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolder.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolder.mel rename to cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolder.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolderSetUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolderSetUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolderSetUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolderSetUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieParameterisedHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieParameterisedHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieProceduralHolder.mel b/cortex-9.7.0/mel/IECoreMaya/ieProceduralHolder.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieProceduralHolder.mel rename to cortex-9.7.0/mel/IECoreMaya/ieProceduralHolder.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieProceduralHolderUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieProceduralHolderUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieProceduralHolderUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieProceduralHolderUI.mel diff --git a/cortex-9.6.0/mel/IECoreMaya/ieSceneShapeUI.mel b/cortex-9.7.0/mel/IECoreMaya/ieSceneShapeUI.mel similarity index 100% rename from cortex-9.6.0/mel/IECoreMaya/ieSceneShapeUI.mel rename to cortex-9.7.0/mel/IECoreMaya/ieSceneShapeUI.mel diff --git a/cortex-9.6.0/menus/IECoreHoudini/cortex.shelf b/cortex-9.7.0/menus/IECoreHoudini/cortex.shelf similarity index 100% rename from cortex-9.6.0/menus/IECoreHoudini/cortex.shelf rename to cortex-9.7.0/menus/IECoreHoudini/cortex.shelf diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Sections.list b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Sections.list similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Sections.list rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Sections.list diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions diff --git a/cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg b/cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg similarity index 100% rename from cortex-9.6.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg rename to cortex-9.7.0/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg diff --git a/cortex-9.6.0/python/IECore/AttributeBlock.py b/cortex-9.7.0/python/IECore/AttributeBlock.py similarity index 100% rename from cortex-9.6.0/python/IECore/AttributeBlock.py rename to cortex-9.7.0/python/IECore/AttributeBlock.py diff --git a/cortex-9.6.0/python/IECore/BasicPreset.py b/cortex-9.7.0/python/IECore/BasicPreset.py similarity index 100% rename from cortex-9.6.0/python/IECore/BasicPreset.py rename to cortex-9.7.0/python/IECore/BasicPreset.py diff --git a/cortex-9.6.0/python/IECore/CapturingMessageHandler.py b/cortex-9.7.0/python/IECore/CapturingMessageHandler.py similarity index 100% rename from cortex-9.6.0/python/IECore/CapturingMessageHandler.py rename to cortex-9.7.0/python/IECore/CapturingMessageHandler.py diff --git a/cortex-9.6.0/python/IECore/CheckImagesOp.py b/cortex-9.7.0/python/IECore/CheckImagesOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/CheckImagesOp.py rename to cortex-9.7.0/python/IECore/CheckImagesOp.py diff --git a/cortex-9.6.0/python/IECore/ClassLoader.py b/cortex-9.7.0/python/IECore/ClassLoader.py similarity index 100% rename from cortex-9.6.0/python/IECore/ClassLoader.py rename to cortex-9.7.0/python/IECore/ClassLoader.py diff --git a/cortex-9.6.0/python/IECore/ClassLsOp.py b/cortex-9.7.0/python/IECore/ClassLsOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/ClassLsOp.py rename to cortex-9.7.0/python/IECore/ClassLsOp.py diff --git a/cortex-9.6.0/python/IECore/ClassParameter.py b/cortex-9.7.0/python/IECore/ClassParameter.py similarity index 100% rename from cortex-9.6.0/python/IECore/ClassParameter.py rename to cortex-9.7.0/python/IECore/ClassParameter.py diff --git a/cortex-9.6.0/python/IECore/ClassVectorParameter.py b/cortex-9.7.0/python/IECore/ClassVectorParameter.py similarity index 100% rename from cortex-9.6.0/python/IECore/ClassVectorParameter.py rename to cortex-9.7.0/python/IECore/ClassVectorParameter.py diff --git a/cortex-9.6.0/python/IECore/CompoundStream.py b/cortex-9.7.0/python/IECore/CompoundStream.py similarity index 100% rename from cortex-9.6.0/python/IECore/CompoundStream.py rename to cortex-9.7.0/python/IECore/CompoundStream.py diff --git a/cortex-9.6.0/python/IECore/CompoundVectorParameter.py b/cortex-9.7.0/python/IECore/CompoundVectorParameter.py similarity index 100% rename from cortex-9.6.0/python/IECore/CompoundVectorParameter.py rename to cortex-9.7.0/python/IECore/CompoundVectorParameter.py diff --git a/cortex-9.6.0/python/IECore/ConfigLoader.py b/cortex-9.7.0/python/IECore/ConfigLoader.py similarity index 97% rename from cortex-9.6.0/python/IECore/ConfigLoader.py rename to cortex-9.7.0/python/IECore/ConfigLoader.py index 0e8983d453..b2abeb2dcd 100644 --- a/cortex-9.6.0/python/IECore/ConfigLoader.py +++ b/cortex-9.7.0/python/IECore/ConfigLoader.py @@ -52,7 +52,14 @@ def loadConfig( searchPaths, contextDict, raiseExceptions = False, subdirectory paths = searchPaths.paths paths.reverse() + visitedPaths = set() for path in paths : + + if path in visitedPaths : + continue + else : + visitedPaths.add( path ) + pyExtTest = re.compile( "^[^~].*\.py$" ) for dirPath, dirNames, fileNames in os.walk( os.path.join( path, subdirectory ) ) : for fileName in filter( pyExtTest.search, sorted( fileNames ) ) : diff --git a/cortex-9.6.0/python/IECore/DataTraits.py b/cortex-9.7.0/python/IECore/DataTraits.py similarity index 100% rename from cortex-9.6.0/python/IECore/DataTraits.py rename to cortex-9.7.0/python/IECore/DataTraits.py diff --git a/cortex-9.6.0/python/IECore/DateTimeParameterParser.py b/cortex-9.7.0/python/IECore/DateTimeParameterParser.py similarity index 100% rename from cortex-9.6.0/python/IECore/DateTimeParameterParser.py rename to cortex-9.7.0/python/IECore/DateTimeParameterParser.py diff --git a/cortex-9.6.0/python/IECore/EditBlock.py b/cortex-9.7.0/python/IECore/EditBlock.py similarity index 100% rename from cortex-9.6.0/python/IECore/EditBlock.py rename to cortex-9.7.0/python/IECore/EditBlock.py diff --git a/cortex-9.6.0/python/IECore/Enum.py b/cortex-9.7.0/python/IECore/Enum.py similarity index 100% rename from cortex-9.6.0/python/IECore/Enum.py rename to cortex-9.7.0/python/IECore/Enum.py diff --git a/cortex-9.6.0/python/IECore/FileSequenceAnalyzerOp.py b/cortex-9.7.0/python/IECore/FileSequenceAnalyzerOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/FileSequenceAnalyzerOp.py rename to cortex-9.7.0/python/IECore/FileSequenceAnalyzerOp.py diff --git a/cortex-9.6.0/python/IECore/FileSequenceFunctions.py b/cortex-9.7.0/python/IECore/FileSequenceFunctions.py similarity index 100% rename from cortex-9.6.0/python/IECore/FileSequenceFunctions.py rename to cortex-9.7.0/python/IECore/FileSequenceFunctions.py diff --git a/cortex-9.6.0/python/IECore/FileSequenceGraphOp.py b/cortex-9.7.0/python/IECore/FileSequenceGraphOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/FileSequenceGraphOp.py rename to cortex-9.7.0/python/IECore/FileSequenceGraphOp.py diff --git a/cortex-9.6.0/python/IECore/FormattedParameterHelp.py b/cortex-9.7.0/python/IECore/FormattedParameterHelp.py similarity index 100% rename from cortex-9.6.0/python/IECore/FormattedParameterHelp.py rename to cortex-9.7.0/python/IECore/FormattedParameterHelp.py diff --git a/cortex-9.6.0/python/IECore/Formatter.py b/cortex-9.7.0/python/IECore/Formatter.py similarity index 100% rename from cortex-9.6.0/python/IECore/Formatter.py rename to cortex-9.7.0/python/IECore/Formatter.py diff --git a/cortex-9.6.0/python/IECore/IDXReader.py b/cortex-9.7.0/python/IECore/IDXReader.py similarity index 100% rename from cortex-9.6.0/python/IECore/IDXReader.py rename to cortex-9.7.0/python/IECore/IDXReader.py diff --git a/cortex-9.6.0/python/IECore/IgnoredExceptions.py b/cortex-9.7.0/python/IECore/IgnoredExceptions.py similarity index 100% rename from cortex-9.6.0/python/IECore/IgnoredExceptions.py rename to cortex-9.7.0/python/IECore/IgnoredExceptions.py diff --git a/cortex-9.6.0/python/IECore/ImageSequenceCompositeOp.py b/cortex-9.7.0/python/IECore/ImageSequenceCompositeOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/ImageSequenceCompositeOp.py rename to cortex-9.7.0/python/IECore/ImageSequenceCompositeOp.py diff --git a/cortex-9.6.0/python/IECore/LayeredDict.py b/cortex-9.7.0/python/IECore/LayeredDict.py similarity index 100% rename from cortex-9.6.0/python/IECore/LayeredDict.py rename to cortex-9.7.0/python/IECore/LayeredDict.py diff --git a/cortex-9.6.0/python/IECore/Log.py b/cortex-9.7.0/python/IECore/Log.py similarity index 100% rename from cortex-9.6.0/python/IECore/Log.py rename to cortex-9.7.0/python/IECore/Log.py diff --git a/cortex-9.6.0/python/IECore/LsHeaderOp.py b/cortex-9.7.0/python/IECore/LsHeaderOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/LsHeaderOp.py rename to cortex-9.7.0/python/IECore/LsHeaderOp.py diff --git a/cortex-9.6.0/python/IECore/MenuDefinition.py b/cortex-9.7.0/python/IECore/MenuDefinition.py similarity index 100% rename from cortex-9.6.0/python/IECore/MenuDefinition.py rename to cortex-9.7.0/python/IECore/MenuDefinition.py diff --git a/cortex-9.6.0/python/IECore/MenuItemDefinition.py b/cortex-9.7.0/python/IECore/MenuItemDefinition.py similarity index 100% rename from cortex-9.6.0/python/IECore/MenuItemDefinition.py rename to cortex-9.7.0/python/IECore/MenuItemDefinition.py diff --git a/cortex-9.6.0/python/IECore/MessageHandlerOverwriting.py b/cortex-9.7.0/python/IECore/MessageHandlerOverwriting.py similarity index 100% rename from cortex-9.6.0/python/IECore/MessageHandlerOverwriting.py rename to cortex-9.7.0/python/IECore/MessageHandlerOverwriting.py diff --git a/cortex-9.6.0/python/IECore/MotionBlock.py b/cortex-9.7.0/python/IECore/MotionBlock.py similarity index 100% rename from cortex-9.6.0/python/IECore/MotionBlock.py rename to cortex-9.7.0/python/IECore/MotionBlock.py diff --git a/cortex-9.6.0/python/IECore/ObjectOverwriting.py b/cortex-9.7.0/python/IECore/ObjectOverwriting.py similarity index 100% rename from cortex-9.6.0/python/IECore/ObjectOverwriting.py rename to cortex-9.7.0/python/IECore/ObjectOverwriting.py diff --git a/cortex-9.6.0/python/IECore/OpOverwriting.py b/cortex-9.7.0/python/IECore/OpOverwriting.py similarity index 100% rename from cortex-9.6.0/python/IECore/OpOverwriting.py rename to cortex-9.7.0/python/IECore/OpOverwriting.py diff --git a/cortex-9.6.0/python/IECore/OptionalCompoundParameter.py b/cortex-9.7.0/python/IECore/OptionalCompoundParameter.py similarity index 100% rename from cortex-9.6.0/python/IECore/OptionalCompoundParameter.py rename to cortex-9.7.0/python/IECore/OptionalCompoundParameter.py diff --git a/cortex-9.6.0/python/IECore/ParameterAlgo.py b/cortex-9.7.0/python/IECore/ParameterAlgo.py similarity index 100% rename from cortex-9.6.0/python/IECore/ParameterAlgo.py rename to cortex-9.7.0/python/IECore/ParameterAlgo.py diff --git a/cortex-9.6.0/python/IECore/ParameterOverwriting.py b/cortex-9.7.0/python/IECore/ParameterOverwriting.py similarity index 100% rename from cortex-9.6.0/python/IECore/ParameterOverwriting.py rename to cortex-9.7.0/python/IECore/ParameterOverwriting.py diff --git a/cortex-9.6.0/python/IECore/ParameterParser.py b/cortex-9.7.0/python/IECore/ParameterParser.py similarity index 100% rename from cortex-9.6.0/python/IECore/ParameterParser.py rename to cortex-9.7.0/python/IECore/ParameterParser.py diff --git a/cortex-9.6.0/python/IECore/ParameterisedOverwriting.py b/cortex-9.7.0/python/IECore/ParameterisedOverwriting.py similarity index 100% rename from cortex-9.6.0/python/IECore/ParameterisedOverwriting.py rename to cortex-9.7.0/python/IECore/ParameterisedOverwriting.py diff --git a/cortex-9.6.0/python/IECore/PointsExpressionOp.py b/cortex-9.7.0/python/IECore/PointsExpressionOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/PointsExpressionOp.py rename to cortex-9.7.0/python/IECore/PointsExpressionOp.py diff --git a/cortex-9.6.0/python/IECore/Preset.py b/cortex-9.7.0/python/IECore/Preset.py similarity index 100% rename from cortex-9.6.0/python/IECore/Preset.py rename to cortex-9.7.0/python/IECore/Preset.py diff --git a/cortex-9.6.0/python/IECore/ReadProcedural.py b/cortex-9.7.0/python/IECore/ReadProcedural.py similarity index 100% rename from cortex-9.6.0/python/IECore/ReadProcedural.py rename to cortex-9.7.0/python/IECore/ReadProcedural.py diff --git a/cortex-9.6.0/python/IECore/RelativePreset.py b/cortex-9.7.0/python/IECore/RelativePreset.py similarity index 100% rename from cortex-9.6.0/python/IECore/RelativePreset.py rename to cortex-9.7.0/python/IECore/RelativePreset.py diff --git a/cortex-9.6.0/python/IECore/RemovePrimitiveVariables.py b/cortex-9.7.0/python/IECore/RemovePrimitiveVariables.py similarity index 100% rename from cortex-9.6.0/python/IECore/RemovePrimitiveVariables.py rename to cortex-9.7.0/python/IECore/RemovePrimitiveVariables.py diff --git a/cortex-9.6.0/python/IECore/RenamePrimitiveVariables.py b/cortex-9.7.0/python/IECore/RenamePrimitiveVariables.py similarity index 100% rename from cortex-9.6.0/python/IECore/RenamePrimitiveVariables.py rename to cortex-9.7.0/python/IECore/RenamePrimitiveVariables.py diff --git a/cortex-9.6.0/python/IECore/SWAReader.py b/cortex-9.7.0/python/IECore/SWAReader.py similarity index 100% rename from cortex-9.6.0/python/IECore/SWAReader.py rename to cortex-9.7.0/python/IECore/SWAReader.py diff --git a/cortex-9.6.0/python/IECore/SearchReplaceOp.py b/cortex-9.7.0/python/IECore/SearchReplaceOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SearchReplaceOp.py rename to cortex-9.7.0/python/IECore/SearchReplaceOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceCatOp.py b/cortex-9.7.0/python/IECore/SequenceCatOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceCatOp.py rename to cortex-9.7.0/python/IECore/SequenceCatOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceConvertOp.py b/cortex-9.7.0/python/IECore/SequenceConvertOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceConvertOp.py rename to cortex-9.7.0/python/IECore/SequenceConvertOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceCpOp.py b/cortex-9.7.0/python/IECore/SequenceCpOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceCpOp.py rename to cortex-9.7.0/python/IECore/SequenceCpOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceLsOp.py b/cortex-9.7.0/python/IECore/SequenceLsOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceLsOp.py rename to cortex-9.7.0/python/IECore/SequenceLsOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceMergeOp.py b/cortex-9.7.0/python/IECore/SequenceMergeOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceMergeOp.py rename to cortex-9.7.0/python/IECore/SequenceMergeOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceMvOp.py b/cortex-9.7.0/python/IECore/SequenceMvOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceMvOp.py rename to cortex-9.7.0/python/IECore/SequenceMvOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceRenumberOp.py b/cortex-9.7.0/python/IECore/SequenceRenumberOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceRenumberOp.py rename to cortex-9.7.0/python/IECore/SequenceRenumberOp.py diff --git a/cortex-9.6.0/python/IECore/SequenceRmOp.py b/cortex-9.7.0/python/IECore/SequenceRmOp.py similarity index 100% rename from cortex-9.6.0/python/IECore/SequenceRmOp.py rename to cortex-9.7.0/python/IECore/SequenceRmOp.py diff --git a/cortex-9.6.0/python/IECore/StringUtil.py b/cortex-9.7.0/python/IECore/StringUtil.py similarity index 100% rename from cortex-9.6.0/python/IECore/StringUtil.py rename to cortex-9.7.0/python/IECore/StringUtil.py diff --git a/cortex-9.6.0/python/IECore/Struct.py b/cortex-9.7.0/python/IECore/Struct.py similarity index 100% rename from cortex-9.6.0/python/IECore/Struct.py rename to cortex-9.7.0/python/IECore/Struct.py diff --git a/cortex-9.6.0/python/IECore/SubstitutedDict.py b/cortex-9.7.0/python/IECore/SubstitutedDict.py similarity index 100% rename from cortex-9.6.0/python/IECore/SubstitutedDict.py rename to cortex-9.7.0/python/IECore/SubstitutedDict.py diff --git a/cortex-9.6.0/python/IECore/TransformBlock.py b/cortex-9.7.0/python/IECore/TransformBlock.py similarity index 100% rename from cortex-9.6.0/python/IECore/TransformBlock.py rename to cortex-9.7.0/python/IECore/TransformBlock.py diff --git a/cortex-9.6.0/python/IECore/VisualiserProcedural.py b/cortex-9.7.0/python/IECore/VisualiserProcedural.py similarity index 100% rename from cortex-9.6.0/python/IECore/VisualiserProcedural.py rename to cortex-9.7.0/python/IECore/VisualiserProcedural.py diff --git a/cortex-9.6.0/python/IECore/WorldBlock.py b/cortex-9.7.0/python/IECore/WorldBlock.py similarity index 100% rename from cortex-9.6.0/python/IECore/WorldBlock.py rename to cortex-9.7.0/python/IECore/WorldBlock.py diff --git a/cortex-9.6.0/python/IECore/WrappedTextFormatter.py b/cortex-9.7.0/python/IECore/WrappedTextFormatter.py similarity index 100% rename from cortex-9.6.0/python/IECore/WrappedTextFormatter.py rename to cortex-9.7.0/python/IECore/WrappedTextFormatter.py diff --git a/cortex-9.6.0/python/IECore/__init__.py b/cortex-9.7.0/python/IECore/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECore/__init__.py rename to cortex-9.7.0/python/IECore/__init__.py diff --git a/cortex-9.6.0/python/IECore/curry.py b/cortex-9.7.0/python/IECore/curry.py similarity index 100% rename from cortex-9.6.0/python/IECore/curry.py rename to cortex-9.7.0/python/IECore/curry.py diff --git a/cortex-9.6.0/python/IECore/registerObject.py b/cortex-9.7.0/python/IECore/registerObject.py similarity index 100% rename from cortex-9.6.0/python/IECore/registerObject.py rename to cortex-9.7.0/python/IECore/registerObject.py diff --git a/cortex-9.6.0/python/IECore/registerRunTimeTyped.py b/cortex-9.7.0/python/IECore/registerRunTimeTyped.py similarity index 100% rename from cortex-9.6.0/python/IECore/registerRunTimeTyped.py rename to cortex-9.7.0/python/IECore/registerRunTimeTyped.py diff --git a/cortex-9.6.0/python/IECoreGL/State.py b/cortex-9.7.0/python/IECoreGL/State.py similarity index 100% rename from cortex-9.6.0/python/IECoreGL/State.py rename to cortex-9.7.0/python/IECoreGL/State.py diff --git a/cortex-9.6.0/python/IECoreGL/__init__.py b/cortex-9.7.0/python/IECoreGL/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreGL/__init__.py rename to cortex-9.7.0/python/IECoreGL/__init__.py diff --git a/cortex-9.6.0/python/IECoreHoudini/ActiveTake.py b/cortex-9.7.0/python/IECoreHoudini/ActiveTake.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/ActiveTake.py rename to cortex-9.7.0/python/IECoreHoudini/ActiveTake.py diff --git a/cortex-9.6.0/python/IECoreHoudini/FnOpHolder.py b/cortex-9.7.0/python/IECoreHoudini/FnOpHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/FnOpHolder.py rename to cortex-9.7.0/python/IECoreHoudini/FnOpHolder.py diff --git a/cortex-9.6.0/python/IECoreHoudini/FnParameterisedHolder.py b/cortex-9.7.0/python/IECoreHoudini/FnParameterisedHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/FnParameterisedHolder.py rename to cortex-9.7.0/python/IECoreHoudini/FnParameterisedHolder.py diff --git a/cortex-9.6.0/python/IECoreHoudini/FnProceduralHolder.py b/cortex-9.7.0/python/IECoreHoudini/FnProceduralHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/FnProceduralHolder.py rename to cortex-9.7.0/python/IECoreHoudini/FnProceduralHolder.py diff --git a/cortex-9.6.0/python/IECoreHoudini/ParmTemplates.py b/cortex-9.7.0/python/IECoreHoudini/ParmTemplates.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/ParmTemplates.py rename to cortex-9.7.0/python/IECoreHoudini/ParmTemplates.py diff --git a/cortex-9.6.0/python/IECoreHoudini/TemporaryParameterValues.py b/cortex-9.7.0/python/IECoreHoudini/TemporaryParameterValues.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/TemporaryParameterValues.py rename to cortex-9.7.0/python/IECoreHoudini/TemporaryParameterValues.py diff --git a/cortex-9.6.0/python/IECoreHoudini/TestCase.py b/cortex-9.7.0/python/IECoreHoudini/TestCase.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/TestCase.py rename to cortex-9.7.0/python/IECoreHoudini/TestCase.py diff --git a/cortex-9.6.0/python/IECoreHoudini/TestProgram.py b/cortex-9.7.0/python/IECoreHoudini/TestProgram.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/TestProgram.py rename to cortex-9.7.0/python/IECoreHoudini/TestProgram.py diff --git a/cortex-9.6.0/python/IECoreHoudini/UpdateMode.py b/cortex-9.7.0/python/IECoreHoudini/UpdateMode.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/UpdateMode.py rename to cortex-9.7.0/python/IECoreHoudini/UpdateMode.py diff --git a/cortex-9.6.0/python/IECoreHoudini/Utils.py b/cortex-9.7.0/python/IECoreHoudini/Utils.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/Utils.py rename to cortex-9.7.0/python/IECoreHoudini/Utils.py diff --git a/cortex-9.6.0/python/IECoreHoudini/__init__.py b/cortex-9.7.0/python/IECoreHoudini/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreHoudini/__init__.py rename to cortex-9.7.0/python/IECoreHoudini/__init__.py diff --git a/cortex-9.6.0/python/IECoreMaya/AttributeEditorControl.py b/cortex-9.7.0/python/IECoreMaya/AttributeEditorControl.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/AttributeEditorControl.py rename to cortex-9.7.0/python/IECoreMaya/AttributeEditorControl.py diff --git a/cortex-9.6.0/python/IECoreMaya/BakeTransform.py b/cortex-9.7.0/python/IECoreMaya/BakeTransform.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/BakeTransform.py rename to cortex-9.7.0/python/IECoreMaya/BakeTransform.py diff --git a/cortex-9.6.0/python/IECoreMaya/BoolParameterUI.py b/cortex-9.7.0/python/IECoreMaya/BoolParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/BoolParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/BoolParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/BoxParameterUI.py b/cortex-9.7.0/python/IECoreMaya/BoxParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/BoxParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/BoxParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ClassParameterUI.py b/cortex-9.7.0/python/IECoreMaya/ClassParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ClassParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/ClassParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ClassVectorParameterUI.py b/cortex-9.7.0/python/IECoreMaya/ClassVectorParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ClassVectorParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/ClassVectorParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/Collapsible.py b/cortex-9.7.0/python/IECoreMaya/Collapsible.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/Collapsible.py rename to cortex-9.7.0/python/IECoreMaya/Collapsible.py diff --git a/cortex-9.6.0/python/IECoreMaya/ColorParameterUI.py b/cortex-9.7.0/python/IECoreMaya/ColorParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ColorParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/ColorParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/CompoundParameterUI.py b/cortex-9.7.0/python/IECoreMaya/CompoundParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/CompoundParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/CompoundParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/DAGPathParameter.py b/cortex-9.7.0/python/IECoreMaya/DAGPathParameter.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/DAGPathParameter.py rename to cortex-9.7.0/python/IECoreMaya/DAGPathParameter.py diff --git a/cortex-9.6.0/python/IECoreMaya/DAGPathVectorParameter.py b/cortex-9.7.0/python/IECoreMaya/DAGPathVectorParameter.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/DAGPathVectorParameter.py rename to cortex-9.7.0/python/IECoreMaya/DAGPathVectorParameter.py diff --git a/cortex-9.6.0/python/IECoreMaya/DirNameParameterUI.py b/cortex-9.7.0/python/IECoreMaya/DirNameParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/DirNameParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/DirNameParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/FileBrowser.py b/cortex-9.7.0/python/IECoreMaya/FileBrowser.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FileBrowser.py rename to cortex-9.7.0/python/IECoreMaya/FileBrowser.py diff --git a/cortex-9.6.0/python/IECoreMaya/FileDialog.py b/cortex-9.7.0/python/IECoreMaya/FileDialog.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FileDialog.py rename to cortex-9.7.0/python/IECoreMaya/FileDialog.py diff --git a/cortex-9.6.0/python/IECoreMaya/FileNameParameterUI.py b/cortex-9.7.0/python/IECoreMaya/FileNameParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FileNameParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/FileNameParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/FileSequenceParameterUI.py b/cortex-9.7.0/python/IECoreMaya/FileSequenceParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FileSequenceParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/FileSequenceParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnConverterHolder.py b/cortex-9.7.0/python/IECoreMaya/FnConverterHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnConverterHolder.py rename to cortex-9.7.0/python/IECoreMaya/FnConverterHolder.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnDagNode.py b/cortex-9.7.0/python/IECoreMaya/FnDagNode.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnDagNode.py rename to cortex-9.7.0/python/IECoreMaya/FnDagNode.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnOpHolder.py b/cortex-9.7.0/python/IECoreMaya/FnOpHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnOpHolder.py rename to cortex-9.7.0/python/IECoreMaya/FnOpHolder.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnParameterisedHolder.py b/cortex-9.7.0/python/IECoreMaya/FnParameterisedHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnParameterisedHolder.py rename to cortex-9.7.0/python/IECoreMaya/FnParameterisedHolder.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnParameterisedHolderSet.py b/cortex-9.7.0/python/IECoreMaya/FnParameterisedHolderSet.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnParameterisedHolderSet.py rename to cortex-9.7.0/python/IECoreMaya/FnParameterisedHolderSet.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnProceduralHolder.py b/cortex-9.7.0/python/IECoreMaya/FnProceduralHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnProceduralHolder.py rename to cortex-9.7.0/python/IECoreMaya/FnProceduralHolder.py diff --git a/cortex-9.6.0/python/IECoreMaya/FnSceneShape.py b/cortex-9.7.0/python/IECoreMaya/FnSceneShape.py similarity index 99% rename from cortex-9.6.0/python/IECoreMaya/FnSceneShape.py rename to cortex-9.7.0/python/IECoreMaya/FnSceneShape.py index 19a6fec4ff..eb4ebf1ac9 100644 --- a/cortex-9.6.0/python/IECoreMaya/FnSceneShape.py +++ b/cortex-9.7.0/python/IECoreMaya/FnSceneShape.py @@ -286,7 +286,7 @@ def expandOnce( self ) : if not scene: return [] - sceneChildren = scene.childNames() + sceneChildren = sorted( scene.childNames() ) if sceneChildren == []: # No children to expand to diff --git a/cortex-9.6.0/python/IECoreMaya/FnTransientParameterisedHolderNode.py b/cortex-9.7.0/python/IECoreMaya/FnTransientParameterisedHolderNode.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/FnTransientParameterisedHolderNode.py rename to cortex-9.7.0/python/IECoreMaya/FnTransientParameterisedHolderNode.py diff --git a/cortex-9.6.0/python/IECoreMaya/GenericParameterUI.py b/cortex-9.7.0/python/IECoreMaya/GenericParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/GenericParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/GenericParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/GeometryCombinerUI.py b/cortex-9.7.0/python/IECoreMaya/GeometryCombinerUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/GeometryCombinerUI.py rename to cortex-9.7.0/python/IECoreMaya/GeometryCombinerUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/LineSegmentParameterUI.py b/cortex-9.7.0/python/IECoreMaya/LineSegmentParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/LineSegmentParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/LineSegmentParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ManipulatorUI.py b/cortex-9.7.0/python/IECoreMaya/ManipulatorUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ManipulatorUI.py rename to cortex-9.7.0/python/IECoreMaya/ManipulatorUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/MayaTypeId.py b/cortex-9.7.0/python/IECoreMaya/MayaTypeId.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/MayaTypeId.py rename to cortex-9.7.0/python/IECoreMaya/MayaTypeId.py diff --git a/cortex-9.6.0/python/IECoreMaya/Menu.py b/cortex-9.7.0/python/IECoreMaya/Menu.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/Menu.py rename to cortex-9.7.0/python/IECoreMaya/Menu.py diff --git a/cortex-9.6.0/python/IECoreMaya/Menus.py b/cortex-9.7.0/python/IECoreMaya/Menus.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/Menus.py rename to cortex-9.7.0/python/IECoreMaya/Menus.py diff --git a/cortex-9.6.0/python/IECoreMaya/MeshOpHolderUtil.py b/cortex-9.7.0/python/IECoreMaya/MeshOpHolderUtil.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/MeshOpHolderUtil.py rename to cortex-9.7.0/python/IECoreMaya/MeshOpHolderUtil.py diff --git a/cortex-9.6.0/python/IECoreMaya/ModalDialogue.py b/cortex-9.7.0/python/IECoreMaya/ModalDialogue.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ModalDialogue.py rename to cortex-9.7.0/python/IECoreMaya/ModalDialogue.py diff --git a/cortex-9.6.0/python/IECoreMaya/NodeParameter.py b/cortex-9.7.0/python/IECoreMaya/NodeParameter.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/NodeParameter.py rename to cortex-9.7.0/python/IECoreMaya/NodeParameter.py diff --git a/cortex-9.6.0/python/IECoreMaya/NoteParameterUI.py b/cortex-9.7.0/python/IECoreMaya/NoteParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/NoteParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/NoteParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/NumericParameterUI.py b/cortex-9.7.0/python/IECoreMaya/NumericParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/NumericParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/NumericParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/NumericVectorParameterUI.py b/cortex-9.7.0/python/IECoreMaya/NumericVectorParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/NumericVectorParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/NumericVectorParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/OpWindow.py b/cortex-9.7.0/python/IECoreMaya/OpWindow.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/OpWindow.py rename to cortex-9.7.0/python/IECoreMaya/OpWindow.py diff --git a/cortex-9.6.0/python/IECoreMaya/Panel.py b/cortex-9.7.0/python/IECoreMaya/Panel.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/Panel.py rename to cortex-9.7.0/python/IECoreMaya/Panel.py diff --git a/cortex-9.6.0/python/IECoreMaya/ParameterClipboardUI.py b/cortex-9.7.0/python/IECoreMaya/ParameterClipboardUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ParameterClipboardUI.py rename to cortex-9.7.0/python/IECoreMaya/ParameterClipboardUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ParameterPanel.py b/cortex-9.7.0/python/IECoreMaya/ParameterPanel.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ParameterPanel.py rename to cortex-9.7.0/python/IECoreMaya/ParameterPanel.py diff --git a/cortex-9.6.0/python/IECoreMaya/ParameterUI.py b/cortex-9.7.0/python/IECoreMaya/ParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/ParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/PathParameterUI.py b/cortex-9.7.0/python/IECoreMaya/PathParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/PathParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/PathParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/PresetsOnlyParameterUI.py b/cortex-9.7.0/python/IECoreMaya/PresetsOnlyParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/PresetsOnlyParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/PresetsOnlyParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/PresetsUI.py b/cortex-9.7.0/python/IECoreMaya/PresetsUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/PresetsUI.py rename to cortex-9.7.0/python/IECoreMaya/PresetsUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ProceduralHolderUI.py b/cortex-9.7.0/python/IECoreMaya/ProceduralHolderUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ProceduralHolderUI.py rename to cortex-9.7.0/python/IECoreMaya/ProceduralHolderUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/SceneShapeUI.py b/cortex-9.7.0/python/IECoreMaya/SceneShapeUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/SceneShapeUI.py rename to cortex-9.7.0/python/IECoreMaya/SceneShapeUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/ScopedSelection.py b/cortex-9.7.0/python/IECoreMaya/ScopedSelection.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/ScopedSelection.py rename to cortex-9.7.0/python/IECoreMaya/ScopedSelection.py diff --git a/cortex-9.6.0/python/IECoreMaya/SplineParameterUI.py b/cortex-9.7.0/python/IECoreMaya/SplineParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/SplineParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/SplineParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/StringParameterUI.py b/cortex-9.7.0/python/IECoreMaya/StringParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/StringParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/StringParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/StringUtil.py b/cortex-9.7.0/python/IECoreMaya/StringUtil.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/StringUtil.py rename to cortex-9.7.0/python/IECoreMaya/StringUtil.py diff --git a/cortex-9.6.0/python/IECoreMaya/StringVectorParameterUI.py b/cortex-9.7.0/python/IECoreMaya/StringVectorParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/StringVectorParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/StringVectorParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/TemporaryAttributeValues.py b/cortex-9.7.0/python/IECoreMaya/TemporaryAttributeValues.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/TemporaryAttributeValues.py rename to cortex-9.7.0/python/IECoreMaya/TemporaryAttributeValues.py diff --git a/cortex-9.6.0/python/IECoreMaya/TestCase.py b/cortex-9.7.0/python/IECoreMaya/TestCase.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/TestCase.py rename to cortex-9.7.0/python/IECoreMaya/TestCase.py diff --git a/cortex-9.6.0/python/IECoreMaya/TestProgram.py b/cortex-9.7.0/python/IECoreMaya/TestProgram.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/TestProgram.py rename to cortex-9.7.0/python/IECoreMaya/TestProgram.py diff --git a/cortex-9.6.0/python/IECoreMaya/TransformationMatrixParameterUI.py b/cortex-9.7.0/python/IECoreMaya/TransformationMatrixParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/TransformationMatrixParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/TransformationMatrixParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/TransientParameterisedHolderNode.py b/cortex-9.7.0/python/IECoreMaya/TransientParameterisedHolderNode.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/TransientParameterisedHolderNode.py rename to cortex-9.7.0/python/IECoreMaya/TransientParameterisedHolderNode.py diff --git a/cortex-9.6.0/python/IECoreMaya/UIElement.py b/cortex-9.7.0/python/IECoreMaya/UIElement.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/UIElement.py rename to cortex-9.7.0/python/IECoreMaya/UIElement.py diff --git a/cortex-9.6.0/python/IECoreMaya/UITemplate.py b/cortex-9.7.0/python/IECoreMaya/UITemplate.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/UITemplate.py rename to cortex-9.7.0/python/IECoreMaya/UITemplate.py diff --git a/cortex-9.6.0/python/IECoreMaya/UndoDisabled.py b/cortex-9.7.0/python/IECoreMaya/UndoDisabled.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/UndoDisabled.py rename to cortex-9.7.0/python/IECoreMaya/UndoDisabled.py diff --git a/cortex-9.6.0/python/IECoreMaya/VectorParameterUI.py b/cortex-9.7.0/python/IECoreMaya/VectorParameterUI.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/VectorParameterUI.py rename to cortex-9.7.0/python/IECoreMaya/VectorParameterUI.py diff --git a/cortex-9.6.0/python/IECoreMaya/WaitCursor.py b/cortex-9.7.0/python/IECoreMaya/WaitCursor.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/WaitCursor.py rename to cortex-9.7.0/python/IECoreMaya/WaitCursor.py diff --git a/cortex-9.6.0/python/IECoreMaya/__init__.py b/cortex-9.7.0/python/IECoreMaya/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/__init__.py rename to cortex-9.7.0/python/IECoreMaya/__init__.py diff --git a/cortex-9.6.0/python/IECoreMaya/mayaDo.py b/cortex-9.7.0/python/IECoreMaya/mayaDo.py similarity index 100% rename from cortex-9.6.0/python/IECoreMaya/mayaDo.py rename to cortex-9.7.0/python/IECoreMaya/mayaDo.py diff --git a/cortex-9.6.0/python/IECoreNuke/FnAxis.py b/cortex-9.7.0/python/IECoreNuke/FnAxis.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/FnAxis.py rename to cortex-9.7.0/python/IECoreNuke/FnAxis.py diff --git a/cortex-9.6.0/python/IECoreNuke/FnOpHolder.py b/cortex-9.7.0/python/IECoreNuke/FnOpHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/FnOpHolder.py rename to cortex-9.7.0/python/IECoreNuke/FnOpHolder.py diff --git a/cortex-9.6.0/python/IECoreNuke/FnParameterisedHolder.py b/cortex-9.7.0/python/IECoreNuke/FnParameterisedHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/FnParameterisedHolder.py rename to cortex-9.7.0/python/IECoreNuke/FnParameterisedHolder.py diff --git a/cortex-9.6.0/python/IECoreNuke/FnProceduralHolder.py b/cortex-9.7.0/python/IECoreNuke/FnProceduralHolder.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/FnProceduralHolder.py rename to cortex-9.7.0/python/IECoreNuke/FnProceduralHolder.py diff --git a/cortex-9.6.0/python/IECoreNuke/KnobAccessors.py b/cortex-9.7.0/python/IECoreNuke/KnobAccessors.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/KnobAccessors.py rename to cortex-9.7.0/python/IECoreNuke/KnobAccessors.py diff --git a/cortex-9.6.0/python/IECoreNuke/KnobConverters.py b/cortex-9.7.0/python/IECoreNuke/KnobConverters.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/KnobConverters.py rename to cortex-9.7.0/python/IECoreNuke/KnobConverters.py diff --git a/cortex-9.6.0/python/IECoreNuke/Menus.py b/cortex-9.7.0/python/IECoreNuke/Menus.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/Menus.py rename to cortex-9.7.0/python/IECoreNuke/Menus.py diff --git a/cortex-9.6.0/python/IECoreNuke/StringUtil.py b/cortex-9.7.0/python/IECoreNuke/StringUtil.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/StringUtil.py rename to cortex-9.7.0/python/IECoreNuke/StringUtil.py diff --git a/cortex-9.6.0/python/IECoreNuke/TestCase.py b/cortex-9.7.0/python/IECoreNuke/TestCase.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/TestCase.py rename to cortex-9.7.0/python/IECoreNuke/TestCase.py diff --git a/cortex-9.6.0/python/IECoreNuke/UndoManagers.py b/cortex-9.7.0/python/IECoreNuke/UndoManagers.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/UndoManagers.py rename to cortex-9.7.0/python/IECoreNuke/UndoManagers.py diff --git a/cortex-9.6.0/python/IECoreNuke/__init__.py b/cortex-9.7.0/python/IECoreNuke/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreNuke/__init__.py rename to cortex-9.7.0/python/IECoreNuke/__init__.py diff --git a/cortex-9.6.0/python/IECoreRI/ExecuteProcedural.py b/cortex-9.7.0/python/IECoreRI/ExecuteProcedural.py similarity index 100% rename from cortex-9.6.0/python/IECoreRI/ExecuteProcedural.py rename to cortex-9.7.0/python/IECoreRI/ExecuteProcedural.py diff --git a/cortex-9.6.0/python/IECoreRI/MakeRibOp.py b/cortex-9.7.0/python/IECoreRI/MakeRibOp.py similarity index 100% rename from cortex-9.6.0/python/IECoreRI/MakeRibOp.py rename to cortex-9.7.0/python/IECoreRI/MakeRibOp.py diff --git a/cortex-9.6.0/python/IECoreRI/TestCase.py b/cortex-9.7.0/python/IECoreRI/TestCase.py similarity index 100% rename from cortex-9.6.0/python/IECoreRI/TestCase.py rename to cortex-9.7.0/python/IECoreRI/TestCase.py diff --git a/cortex-9.6.0/python/IECoreRI/__init__.py b/cortex-9.7.0/python/IECoreRI/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreRI/__init__.py rename to cortex-9.7.0/python/IECoreRI/__init__.py diff --git a/cortex-9.6.0/python/IECoreTruelight/__init__.py b/cortex-9.7.0/python/IECoreTruelight/__init__.py similarity index 100% rename from cortex-9.6.0/python/IECoreTruelight/__init__.py rename to cortex-9.7.0/python/IECoreTruelight/__init__.py diff --git a/cortex-9.6.0/rsl/IECoreRI/ArrayAlgo.h b/cortex-9.7.0/rsl/IECoreRI/ArrayAlgo.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/ArrayAlgo.h rename to cortex-9.7.0/rsl/IECoreRI/ArrayAlgo.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Brownian.h b/cortex-9.7.0/rsl/IECoreRI/Brownian.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Brownian.h rename to cortex-9.7.0/rsl/IECoreRI/Brownian.h diff --git a/cortex-9.6.0/rsl/IECoreRI/ColorAlgo.h b/cortex-9.7.0/rsl/IECoreRI/ColorAlgo.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/ColorAlgo.h rename to cortex-9.7.0/rsl/IECoreRI/ColorAlgo.h diff --git a/cortex-9.6.0/rsl/IECoreRI/CompositeAlgo.h b/cortex-9.7.0/rsl/IECoreRI/CompositeAlgo.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/CompositeAlgo.h rename to cortex-9.7.0/rsl/IECoreRI/CompositeAlgo.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Derivative.h b/cortex-9.7.0/rsl/IECoreRI/Derivative.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Derivative.h rename to cortex-9.7.0/rsl/IECoreRI/Derivative.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Distance.h b/cortex-9.7.0/rsl/IECoreRI/Distance.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Distance.h rename to cortex-9.7.0/rsl/IECoreRI/Distance.h diff --git a/cortex-9.6.0/rsl/IECoreRI/EuclideanToSphericalTransform.h b/cortex-9.7.0/rsl/IECoreRI/EuclideanToSphericalTransform.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/EuclideanToSphericalTransform.h rename to cortex-9.7.0/rsl/IECoreRI/EuclideanToSphericalTransform.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Filter.h b/cortex-9.7.0/rsl/IECoreRI/Filter.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Filter.h rename to cortex-9.7.0/rsl/IECoreRI/Filter.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Gaussian.h b/cortex-9.7.0/rsl/IECoreRI/Gaussian.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Gaussian.h rename to cortex-9.7.0/rsl/IECoreRI/Gaussian.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Noise.h b/cortex-9.7.0/rsl/IECoreRI/Noise.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Noise.h rename to cortex-9.7.0/rsl/IECoreRI/Noise.h diff --git a/cortex-9.6.0/rsl/IECoreRI/RayAlgo.h b/cortex-9.7.0/rsl/IECoreRI/RayAlgo.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/RayAlgo.h rename to cortex-9.7.0/rsl/IECoreRI/RayAlgo.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Roots.h b/cortex-9.7.0/rsl/IECoreRI/Roots.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Roots.h rename to cortex-9.7.0/rsl/IECoreRI/Roots.h diff --git a/cortex-9.6.0/rsl/IECoreRI/SphericalToEuclideanTransform.h b/cortex-9.7.0/rsl/IECoreRI/SphericalToEuclideanTransform.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/SphericalToEuclideanTransform.h rename to cortex-9.7.0/rsl/IECoreRI/SphericalToEuclideanTransform.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Spline.h b/cortex-9.7.0/rsl/IECoreRI/Spline.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Spline.h rename to cortex-9.7.0/rsl/IECoreRI/Spline.h diff --git a/cortex-9.6.0/rsl/IECoreRI/StringAlgo.h b/cortex-9.7.0/rsl/IECoreRI/StringAlgo.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/StringAlgo.h rename to cortex-9.7.0/rsl/IECoreRI/StringAlgo.h diff --git a/cortex-9.6.0/rsl/IECoreRI/Turbulence.h b/cortex-9.7.0/rsl/IECoreRI/Turbulence.h similarity index 100% rename from cortex-9.6.0/rsl/IECoreRI/Turbulence.h rename to cortex-9.7.0/rsl/IECoreRI/Turbulence.h diff --git a/cortex-9.6.0/scripts/do b/cortex-9.7.0/scripts/do similarity index 100% rename from cortex-9.6.0/scripts/do rename to cortex-9.7.0/scripts/do diff --git a/cortex-9.6.0/src/IECore/AddSmoothSkinningInfluencesOp.cpp b/cortex-9.7.0/src/IECore/AddSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/AddSmoothSkinningInfluencesOp.cpp rename to cortex-9.7.0/src/IECore/AddSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.6.0/src/IECore/AlexaLogcToLinearOp.cpp b/cortex-9.7.0/src/IECore/AlexaLogcToLinearOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/AlexaLogcToLinearOp.cpp rename to cortex-9.7.0/src/IECore/AlexaLogcToLinearOp.cpp diff --git a/cortex-9.6.0/src/IECore/AttributeBlock.cpp b/cortex-9.7.0/src/IECore/AttributeBlock.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/AttributeBlock.cpp rename to cortex-9.7.0/src/IECore/AttributeBlock.cpp diff --git a/cortex-9.6.0/src/IECore/AttributeState.cpp b/cortex-9.7.0/src/IECore/AttributeState.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/AttributeState.cpp rename to cortex-9.7.0/src/IECore/AttributeState.cpp diff --git a/cortex-9.6.0/src/IECore/BinaryFrameList.cpp b/cortex-9.7.0/src/IECore/BinaryFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/BinaryFrameList.cpp rename to cortex-9.7.0/src/IECore/BinaryFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/BlindDataHolder.cpp b/cortex-9.7.0/src/IECore/BlindDataHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/BlindDataHolder.cpp rename to cortex-9.7.0/src/IECore/BlindDataHolder.cpp diff --git a/cortex-9.6.0/src/IECore/CINImageReader.cpp b/cortex-9.7.0/src/IECore/CINImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CINImageReader.cpp rename to cortex-9.7.0/src/IECore/CINImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/CINImageWriter.cpp b/cortex-9.7.0/src/IECore/CINImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CINImageWriter.cpp rename to cortex-9.7.0/src/IECore/CINImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/CachedReader.cpp b/cortex-9.7.0/src/IECore/CachedReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CachedReader.cpp rename to cortex-9.7.0/src/IECore/CachedReader.cpp diff --git a/cortex-9.6.0/src/IECore/CamelCase.cpp b/cortex-9.7.0/src/IECore/CamelCase.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CamelCase.cpp rename to cortex-9.7.0/src/IECore/CamelCase.cpp diff --git a/cortex-9.6.0/src/IECore/Camera.cpp b/cortex-9.7.0/src/IECore/Camera.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Camera.cpp rename to cortex-9.7.0/src/IECore/Camera.cpp diff --git a/cortex-9.6.0/src/IECore/CameraController.cpp b/cortex-9.7.0/src/IECore/CameraController.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CameraController.cpp rename to cortex-9.7.0/src/IECore/CameraController.cpp diff --git a/cortex-9.6.0/src/IECore/CapturingRenderer.cpp b/cortex-9.7.0/src/IECore/CapturingRenderer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CapturingRenderer.cpp rename to cortex-9.7.0/src/IECore/CapturingRenderer.cpp diff --git a/cortex-9.6.0/src/IECore/ChannelOp.cpp b/cortex-9.7.0/src/IECore/ChannelOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ChannelOp.cpp rename to cortex-9.7.0/src/IECore/ChannelOp.cpp diff --git a/cortex-9.6.0/src/IECore/CineonToLinearOp.cpp b/cortex-9.7.0/src/IECore/CineonToLinearOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CineonToLinearOp.cpp rename to cortex-9.7.0/src/IECore/CineonToLinearOp.cpp diff --git a/cortex-9.6.0/src/IECore/ClampOp.cpp b/cortex-9.7.0/src/IECore/ClampOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ClampOp.cpp rename to cortex-9.7.0/src/IECore/ClampOp.cpp diff --git a/cortex-9.6.0/src/IECore/ClientDisplayDriver.cpp b/cortex-9.7.0/src/IECore/ClientDisplayDriver.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ClientDisplayDriver.cpp rename to cortex-9.7.0/src/IECore/ClientDisplayDriver.cpp diff --git a/cortex-9.6.0/src/IECore/ClippingPlane.cpp b/cortex-9.7.0/src/IECore/ClippingPlane.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ClippingPlane.cpp rename to cortex-9.7.0/src/IECore/ClippingPlane.cpp diff --git a/cortex-9.6.0/src/IECore/ColorSpaceTransformOp.cpp b/cortex-9.7.0/src/IECore/ColorSpaceTransformOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ColorSpaceTransformOp.cpp rename to cortex-9.7.0/src/IECore/ColorSpaceTransformOp.cpp diff --git a/cortex-9.6.0/src/IECore/ColorTransformOp.cpp b/cortex-9.7.0/src/IECore/ColorTransformOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ColorTransformOp.cpp rename to cortex-9.7.0/src/IECore/ColorTransformOp.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundData.cpp b/cortex-9.7.0/src/IECore/CompoundData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundData.cpp rename to cortex-9.7.0/src/IECore/CompoundData.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundDataBase.cpp b/cortex-9.7.0/src/IECore/CompoundDataBase.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundDataBase.cpp rename to cortex-9.7.0/src/IECore/CompoundDataBase.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundFrameList.cpp b/cortex-9.7.0/src/IECore/CompoundFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundFrameList.cpp rename to cortex-9.7.0/src/IECore/CompoundFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundMessageHandler.cpp b/cortex-9.7.0/src/IECore/CompoundMessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundMessageHandler.cpp rename to cortex-9.7.0/src/IECore/CompoundMessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundObject.cpp b/cortex-9.7.0/src/IECore/CompoundObject.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundObject.cpp rename to cortex-9.7.0/src/IECore/CompoundObject.cpp diff --git a/cortex-9.6.0/src/IECore/CompoundParameter.cpp b/cortex-9.7.0/src/IECore/CompoundParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompoundParameter.cpp rename to cortex-9.7.0/src/IECore/CompoundParameter.cpp diff --git a/cortex-9.6.0/src/IECore/CompressSmoothSkinningDataOp.cpp b/cortex-9.7.0/src/IECore/CompressSmoothSkinningDataOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CompressSmoothSkinningDataOp.cpp rename to cortex-9.7.0/src/IECore/CompressSmoothSkinningDataOp.cpp diff --git a/cortex-9.6.0/src/IECore/ContrastSmoothSkinningWeightsOp.cpp b/cortex-9.7.0/src/IECore/ContrastSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ContrastSmoothSkinningWeightsOp.cpp rename to cortex-9.7.0/src/IECore/ContrastSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.6.0/src/IECore/Converter.cpp b/cortex-9.7.0/src/IECore/Converter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Converter.cpp rename to cortex-9.7.0/src/IECore/Converter.cpp diff --git a/cortex-9.6.0/src/IECore/CoordinateSystem.cpp b/cortex-9.7.0/src/IECore/CoordinateSystem.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CoordinateSystem.cpp rename to cortex-9.7.0/src/IECore/CoordinateSystem.cpp diff --git a/cortex-9.6.0/src/IECore/CubeColorLookupData.cpp b/cortex-9.7.0/src/IECore/CubeColorLookupData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CubeColorLookupData.cpp rename to cortex-9.7.0/src/IECore/CubeColorLookupData.cpp diff --git a/cortex-9.6.0/src/IECore/CubeColorLookupParameter.cpp b/cortex-9.7.0/src/IECore/CubeColorLookupParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CubeColorLookupParameter.cpp rename to cortex-9.7.0/src/IECore/CubeColorLookupParameter.cpp diff --git a/cortex-9.6.0/src/IECore/CubeColorTransformOp.cpp b/cortex-9.7.0/src/IECore/CubeColorTransformOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CubeColorTransformOp.cpp rename to cortex-9.7.0/src/IECore/CubeColorTransformOp.cpp diff --git a/cortex-9.6.0/src/IECore/CurveExtrudeOp.cpp b/cortex-9.7.0/src/IECore/CurveExtrudeOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurveExtrudeOp.cpp rename to cortex-9.7.0/src/IECore/CurveExtrudeOp.cpp diff --git a/cortex-9.6.0/src/IECore/CurveLineariser.cpp b/cortex-9.7.0/src/IECore/CurveLineariser.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurveLineariser.cpp rename to cortex-9.7.0/src/IECore/CurveLineariser.cpp diff --git a/cortex-9.6.0/src/IECore/CurveTangentsOp.cpp b/cortex-9.7.0/src/IECore/CurveTangentsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurveTangentsOp.cpp rename to cortex-9.7.0/src/IECore/CurveTangentsOp.cpp diff --git a/cortex-9.6.0/src/IECore/CurveTracer.cpp b/cortex-9.7.0/src/IECore/CurveTracer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurveTracer.cpp rename to cortex-9.7.0/src/IECore/CurveTracer.cpp diff --git a/cortex-9.6.0/src/IECore/CurvesMergeOp.cpp b/cortex-9.7.0/src/IECore/CurvesMergeOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurvesMergeOp.cpp rename to cortex-9.7.0/src/IECore/CurvesMergeOp.cpp diff --git a/cortex-9.6.0/src/IECore/CurvesPrimitive.cpp b/cortex-9.7.0/src/IECore/CurvesPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurvesPrimitive.cpp rename to cortex-9.7.0/src/IECore/CurvesPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/CurvesPrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/CurvesPrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/CurvesPrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/CurvesPrimitiveEvaluator.cpp diff --git a/cortex-9.6.0/src/IECore/DPXImageReader.cpp b/cortex-9.7.0/src/IECore/DPXImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DPXImageReader.cpp rename to cortex-9.7.0/src/IECore/DPXImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/DPXImageWriter.cpp b/cortex-9.7.0/src/IECore/DPXImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DPXImageWriter.cpp rename to cortex-9.7.0/src/IECore/DPXImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/Data.cpp b/cortex-9.7.0/src/IECore/Data.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Data.cpp rename to cortex-9.7.0/src/IECore/Data.cpp diff --git a/cortex-9.6.0/src/IECore/DataAlgo.cpp b/cortex-9.7.0/src/IECore/DataAlgo.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DataAlgo.cpp rename to cortex-9.7.0/src/IECore/DataAlgo.cpp diff --git a/cortex-9.6.0/src/IECore/DataCastOp.cpp b/cortex-9.7.0/src/IECore/DataCastOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DataCastOp.cpp rename to cortex-9.7.0/src/IECore/DataCastOp.cpp diff --git a/cortex-9.6.0/src/IECore/DataConvertOp.cpp b/cortex-9.7.0/src/IECore/DataConvertOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DataConvertOp.cpp rename to cortex-9.7.0/src/IECore/DataConvertOp.cpp diff --git a/cortex-9.6.0/src/IECore/DataInterleaveOp.cpp b/cortex-9.7.0/src/IECore/DataInterleaveOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DataInterleaveOp.cpp rename to cortex-9.7.0/src/IECore/DataInterleaveOp.cpp diff --git a/cortex-9.6.0/src/IECore/DataPromoteOp.cpp b/cortex-9.7.0/src/IECore/DataPromoteOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DataPromoteOp.cpp rename to cortex-9.7.0/src/IECore/DataPromoteOp.cpp diff --git a/cortex-9.6.0/src/IECore/DateTimeData.cpp b/cortex-9.7.0/src/IECore/DateTimeData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DateTimeData.cpp rename to cortex-9.7.0/src/IECore/DateTimeData.cpp diff --git a/cortex-9.6.0/src/IECore/DateTimeParameter.cpp b/cortex-9.7.0/src/IECore/DateTimeParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DateTimeParameter.cpp rename to cortex-9.7.0/src/IECore/DateTimeParameter.cpp diff --git a/cortex-9.6.0/src/IECore/DecompressSmoothSkinningDataOp.cpp b/cortex-9.7.0/src/IECore/DecompressSmoothSkinningDataOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DecompressSmoothSkinningDataOp.cpp rename to cortex-9.7.0/src/IECore/DecompressSmoothSkinningDataOp.cpp diff --git a/cortex-9.6.0/src/IECore/DeepImageConverter.cpp b/cortex-9.7.0/src/IECore/DeepImageConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DeepImageConverter.cpp rename to cortex-9.7.0/src/IECore/DeepImageConverter.cpp diff --git a/cortex-9.6.0/src/IECore/DeepImageReader.cpp b/cortex-9.7.0/src/IECore/DeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DeepImageReader.cpp rename to cortex-9.7.0/src/IECore/DeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/DeepImageWriter.cpp b/cortex-9.7.0/src/IECore/DeepImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DeepImageWriter.cpp rename to cortex-9.7.0/src/IECore/DeepImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/DeepPixel.cpp b/cortex-9.7.0/src/IECore/DeepPixel.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DeepPixel.cpp rename to cortex-9.7.0/src/IECore/DeepPixel.cpp diff --git a/cortex-9.6.0/src/IECore/DirNameParameter.cpp b/cortex-9.7.0/src/IECore/DirNameParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DirNameParameter.cpp rename to cortex-9.7.0/src/IECore/DirNameParameter.cpp diff --git a/cortex-9.6.0/src/IECore/DiskPrimitive.cpp b/cortex-9.7.0/src/IECore/DiskPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DiskPrimitive.cpp rename to cortex-9.7.0/src/IECore/DiskPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/Display.cpp b/cortex-9.7.0/src/IECore/Display.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Display.cpp rename to cortex-9.7.0/src/IECore/Display.cpp diff --git a/cortex-9.6.0/src/IECore/DisplayDriver.cpp b/cortex-9.7.0/src/IECore/DisplayDriver.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DisplayDriver.cpp rename to cortex-9.7.0/src/IECore/DisplayDriver.cpp diff --git a/cortex-9.6.0/src/IECore/DisplayDriverServer.cpp b/cortex-9.7.0/src/IECore/DisplayDriverServer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DisplayDriverServer.cpp rename to cortex-9.7.0/src/IECore/DisplayDriverServer.cpp diff --git a/cortex-9.6.0/src/IECore/DisplayDriverServerHeader.cpp b/cortex-9.7.0/src/IECore/DisplayDriverServerHeader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/DisplayDriverServerHeader.cpp rename to cortex-9.7.0/src/IECore/DisplayDriverServerHeader.cpp diff --git a/cortex-9.6.0/src/IECore/EXRDeepImageReader.cpp b/cortex-9.7.0/src/IECore/EXRDeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EXRDeepImageReader.cpp rename to cortex-9.7.0/src/IECore/EXRDeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/EXRDeepImageWriter.cpp b/cortex-9.7.0/src/IECore/EXRDeepImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EXRDeepImageWriter.cpp rename to cortex-9.7.0/src/IECore/EXRDeepImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/EXRImageReader.cpp b/cortex-9.7.0/src/IECore/EXRImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EXRImageReader.cpp rename to cortex-9.7.0/src/IECore/EXRImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/EXRImageWriter.cpp b/cortex-9.7.0/src/IECore/EXRImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EXRImageWriter.cpp rename to cortex-9.7.0/src/IECore/EXRImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/EditBlock.cpp b/cortex-9.7.0/src/IECore/EditBlock.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EditBlock.cpp rename to cortex-9.7.0/src/IECore/EditBlock.cpp diff --git a/cortex-9.6.0/src/IECore/EmptyFrameList.cpp b/cortex-9.7.0/src/IECore/EmptyFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EmptyFrameList.cpp rename to cortex-9.7.0/src/IECore/EmptyFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/EnvMapSampler.cpp b/cortex-9.7.0/src/IECore/EnvMapSampler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/EnvMapSampler.cpp rename to cortex-9.7.0/src/IECore/EnvMapSampler.cpp diff --git a/cortex-9.6.0/src/IECore/Exception.cpp b/cortex-9.7.0/src/IECore/Exception.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Exception.cpp rename to cortex-9.7.0/src/IECore/Exception.cpp diff --git a/cortex-9.6.0/src/IECore/ExclusionFrameList.cpp b/cortex-9.7.0/src/IECore/ExclusionFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ExclusionFrameList.cpp rename to cortex-9.7.0/src/IECore/ExclusionFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/ExternalProcedural.cpp b/cortex-9.7.0/src/IECore/ExternalProcedural.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ExternalProcedural.cpp rename to cortex-9.7.0/src/IECore/ExternalProcedural.cpp diff --git a/cortex-9.6.0/src/IECore/FaceAreaOp.cpp b/cortex-9.7.0/src/IECore/FaceAreaOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FaceAreaOp.cpp rename to cortex-9.7.0/src/IECore/FaceAreaOp.cpp diff --git a/cortex-9.6.0/src/IECore/FaceVaryingPromotionOp.cpp b/cortex-9.7.0/src/IECore/FaceVaryingPromotionOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FaceVaryingPromotionOp.cpp rename to cortex-9.7.0/src/IECore/FaceVaryingPromotionOp.cpp diff --git a/cortex-9.6.0/src/IECore/FileIndexedIO.cpp b/cortex-9.7.0/src/IECore/FileIndexedIO.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileIndexedIO.cpp rename to cortex-9.7.0/src/IECore/FileIndexedIO.cpp diff --git a/cortex-9.6.0/src/IECore/FileNameParameter.cpp b/cortex-9.7.0/src/IECore/FileNameParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileNameParameter.cpp rename to cortex-9.7.0/src/IECore/FileNameParameter.cpp diff --git a/cortex-9.6.0/src/IECore/FileSequence.cpp b/cortex-9.7.0/src/IECore/FileSequence.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileSequence.cpp rename to cortex-9.7.0/src/IECore/FileSequence.cpp diff --git a/cortex-9.6.0/src/IECore/FileSequenceFunctions.cpp b/cortex-9.7.0/src/IECore/FileSequenceFunctions.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileSequenceFunctions.cpp rename to cortex-9.7.0/src/IECore/FileSequenceFunctions.cpp diff --git a/cortex-9.6.0/src/IECore/FileSequenceParameter.cpp b/cortex-9.7.0/src/IECore/FileSequenceParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileSequenceParameter.cpp rename to cortex-9.7.0/src/IECore/FileSequenceParameter.cpp diff --git a/cortex-9.6.0/src/IECore/FileSequenceVectorParameter.cpp b/cortex-9.7.0/src/IECore/FileSequenceVectorParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FileSequenceVectorParameter.cpp rename to cortex-9.7.0/src/IECore/FileSequenceVectorParameter.cpp diff --git a/cortex-9.6.0/src/IECore/FilteredMessageHandler.cpp b/cortex-9.7.0/src/IECore/FilteredMessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FilteredMessageHandler.cpp rename to cortex-9.7.0/src/IECore/FilteredMessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/Font.cpp b/cortex-9.7.0/src/IECore/Font.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Font.cpp rename to cortex-9.7.0/src/IECore/Font.cpp diff --git a/cortex-9.6.0/src/IECore/FrameList.cpp b/cortex-9.7.0/src/IECore/FrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FrameList.cpp rename to cortex-9.7.0/src/IECore/FrameList.cpp diff --git a/cortex-9.6.0/src/IECore/FrameListParameter.cpp b/cortex-9.7.0/src/IECore/FrameListParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FrameListParameter.cpp rename to cortex-9.7.0/src/IECore/FrameListParameter.cpp diff --git a/cortex-9.6.0/src/IECore/FrameRange.cpp b/cortex-9.7.0/src/IECore/FrameRange.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FrameRange.cpp rename to cortex-9.7.0/src/IECore/FrameRange.cpp diff --git a/cortex-9.6.0/src/IECore/FromCoreConverter.cpp b/cortex-9.7.0/src/IECore/FromCoreConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/FromCoreConverter.cpp rename to cortex-9.7.0/src/IECore/FromCoreConverter.cpp diff --git a/cortex-9.6.0/src/IECore/Grade.cpp b/cortex-9.7.0/src/IECore/Grade.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Grade.cpp rename to cortex-9.7.0/src/IECore/Grade.cpp diff --git a/cortex-9.6.0/src/IECore/Group.cpp b/cortex-9.7.0/src/IECore/Group.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Group.cpp rename to cortex-9.7.0/src/IECore/Group.cpp diff --git a/cortex-9.6.0/src/IECore/HdrMergeOp.cpp b/cortex-9.7.0/src/IECore/HdrMergeOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/HdrMergeOp.cpp rename to cortex-9.7.0/src/IECore/HdrMergeOp.cpp diff --git a/cortex-9.6.0/src/IECore/HeaderGenerator.cpp b/cortex-9.7.0/src/IECore/HeaderGenerator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/HeaderGenerator.cpp rename to cortex-9.7.0/src/IECore/HeaderGenerator.cpp diff --git a/cortex-9.6.0/src/IECore/IECore.cpp b/cortex-9.7.0/src/IECore/IECore.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/IECore.cpp rename to cortex-9.7.0/src/IECore/IECore.cpp diff --git a/cortex-9.6.0/src/IECore/IFFFile.cpp b/cortex-9.7.0/src/IECore/IFFFile.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/IFFFile.cpp rename to cortex-9.7.0/src/IECore/IFFFile.cpp diff --git a/cortex-9.6.0/src/IECore/ImageCompositeOp.cpp b/cortex-9.7.0/src/IECore/ImageCompositeOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageCompositeOp.cpp rename to cortex-9.7.0/src/IECore/ImageCompositeOp.cpp diff --git a/cortex-9.6.0/src/IECore/ImageCropOp.cpp b/cortex-9.7.0/src/IECore/ImageCropOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageCropOp.cpp rename to cortex-9.7.0/src/IECore/ImageCropOp.cpp diff --git a/cortex-9.6.0/src/IECore/ImageDiffOp.cpp b/cortex-9.7.0/src/IECore/ImageDiffOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageDiffOp.cpp rename to cortex-9.7.0/src/IECore/ImageDiffOp.cpp diff --git a/cortex-9.6.0/src/IECore/ImageDisplayDriver.cpp b/cortex-9.7.0/src/IECore/ImageDisplayDriver.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageDisplayDriver.cpp rename to cortex-9.7.0/src/IECore/ImageDisplayDriver.cpp diff --git a/cortex-9.6.0/src/IECore/ImagePremultiplyOp.cpp b/cortex-9.7.0/src/IECore/ImagePremultiplyOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImagePremultiplyOp.cpp rename to cortex-9.7.0/src/IECore/ImagePremultiplyOp.cpp diff --git a/cortex-9.6.0/src/IECore/ImagePrimitive.cpp b/cortex-9.7.0/src/IECore/ImagePrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImagePrimitive.cpp rename to cortex-9.7.0/src/IECore/ImagePrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/ImagePrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/ImagePrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImagePrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/ImagePrimitiveEvaluator.cpp diff --git a/cortex-9.6.0/src/IECore/ImageReader.cpp b/cortex-9.7.0/src/IECore/ImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageReader.cpp rename to cortex-9.7.0/src/IECore/ImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/ImageThinner.cpp b/cortex-9.7.0/src/IECore/ImageThinner.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageThinner.cpp rename to cortex-9.7.0/src/IECore/ImageThinner.cpp diff --git a/cortex-9.6.0/src/IECore/ImageUnpremultiplyOp.cpp b/cortex-9.7.0/src/IECore/ImageUnpremultiplyOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageUnpremultiplyOp.cpp rename to cortex-9.7.0/src/IECore/ImageUnpremultiplyOp.cpp diff --git a/cortex-9.6.0/src/IECore/ImageWriter.cpp b/cortex-9.7.0/src/IECore/ImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ImageWriter.cpp rename to cortex-9.7.0/src/IECore/ImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/IndexedIO.cpp b/cortex-9.7.0/src/IECore/IndexedIO.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/IndexedIO.cpp rename to cortex-9.7.0/src/IECore/IndexedIO.cpp diff --git a/cortex-9.6.0/src/IECore/InternedString.cpp b/cortex-9.7.0/src/IECore/InternedString.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/InternedString.cpp rename to cortex-9.7.0/src/IECore/InternedString.cpp diff --git a/cortex-9.6.0/src/IECore/JPEGImageReader.cpp b/cortex-9.7.0/src/IECore/JPEGImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/JPEGImageReader.cpp rename to cortex-9.7.0/src/IECore/JPEGImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/JPEGImageWriter.cpp b/cortex-9.7.0/src/IECore/JPEGImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/JPEGImageWriter.cpp rename to cortex-9.7.0/src/IECore/JPEGImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/LensDistortOp.cpp b/cortex-9.7.0/src/IECore/LensDistortOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LensDistortOp.cpp rename to cortex-9.7.0/src/IECore/LensDistortOp.cpp diff --git a/cortex-9.6.0/src/IECore/LensModel.cpp b/cortex-9.7.0/src/IECore/LensModel.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LensModel.cpp rename to cortex-9.7.0/src/IECore/LensModel.cpp diff --git a/cortex-9.6.0/src/IECore/LevelFilteredMessageHandler.cpp b/cortex-9.7.0/src/IECore/LevelFilteredMessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LevelFilteredMessageHandler.cpp rename to cortex-9.7.0/src/IECore/LevelFilteredMessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/Light.cpp b/cortex-9.7.0/src/IECore/Light.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Light.cpp rename to cortex-9.7.0/src/IECore/Light.cpp diff --git a/cortex-9.6.0/src/IECore/LimitSmoothSkinningInfluencesOp.cpp b/cortex-9.7.0/src/IECore/LimitSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LimitSmoothSkinningInfluencesOp.cpp rename to cortex-9.7.0/src/IECore/LimitSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.6.0/src/IECore/LinearToAlexaLogcOp.cpp b/cortex-9.7.0/src/IECore/LinearToAlexaLogcOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinearToAlexaLogcOp.cpp rename to cortex-9.7.0/src/IECore/LinearToAlexaLogcOp.cpp diff --git a/cortex-9.6.0/src/IECore/LinearToCineonOp.cpp b/cortex-9.7.0/src/IECore/LinearToCineonOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinearToCineonOp.cpp rename to cortex-9.7.0/src/IECore/LinearToCineonOp.cpp diff --git a/cortex-9.6.0/src/IECore/LinearToPanalogOp.cpp b/cortex-9.7.0/src/IECore/LinearToPanalogOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinearToPanalogOp.cpp rename to cortex-9.7.0/src/IECore/LinearToPanalogOp.cpp diff --git a/cortex-9.6.0/src/IECore/LinearToRec709Op.cpp b/cortex-9.7.0/src/IECore/LinearToRec709Op.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinearToRec709Op.cpp rename to cortex-9.7.0/src/IECore/LinearToRec709Op.cpp diff --git a/cortex-9.6.0/src/IECore/LinearToSRGBOp.cpp b/cortex-9.7.0/src/IECore/LinearToSRGBOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinearToSRGBOp.cpp rename to cortex-9.7.0/src/IECore/LinearToSRGBOp.cpp diff --git a/cortex-9.6.0/src/IECore/LinkedScene.cpp b/cortex-9.7.0/src/IECore/LinkedScene.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LinkedScene.cpp rename to cortex-9.7.0/src/IECore/LinkedScene.cpp diff --git a/cortex-9.6.0/src/IECore/LuminanceOp.cpp b/cortex-9.7.0/src/IECore/LuminanceOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/LuminanceOp.cpp rename to cortex-9.7.0/src/IECore/LuminanceOp.cpp diff --git a/cortex-9.6.0/src/IECore/MPlayDisplayDriver.cpp b/cortex-9.7.0/src/IECore/MPlayDisplayDriver.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MPlayDisplayDriver.cpp rename to cortex-9.7.0/src/IECore/MPlayDisplayDriver.cpp diff --git a/cortex-9.6.0/src/IECore/MatrixAlgo.cpp b/cortex-9.7.0/src/IECore/MatrixAlgo.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MatrixAlgo.cpp rename to cortex-9.7.0/src/IECore/MatrixAlgo.cpp diff --git a/cortex-9.6.0/src/IECore/MatrixMotionTransform.cpp b/cortex-9.7.0/src/IECore/MatrixMotionTransform.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MatrixMotionTransform.cpp rename to cortex-9.7.0/src/IECore/MatrixMotionTransform.cpp diff --git a/cortex-9.6.0/src/IECore/MatrixMultiplyOp.cpp b/cortex-9.7.0/src/IECore/MatrixMultiplyOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MatrixMultiplyOp.cpp rename to cortex-9.7.0/src/IECore/MatrixMultiplyOp.cpp diff --git a/cortex-9.6.0/src/IECore/MatrixTransform.cpp b/cortex-9.7.0/src/IECore/MatrixTransform.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MatrixTransform.cpp rename to cortex-9.7.0/src/IECore/MatrixTransform.cpp diff --git a/cortex-9.6.0/src/IECore/MedianCutSampler.cpp b/cortex-9.7.0/src/IECore/MedianCutSampler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MedianCutSampler.cpp rename to cortex-9.7.0/src/IECore/MedianCutSampler.cpp diff --git a/cortex-9.6.0/src/IECore/MemoryIndexedIO.cpp b/cortex-9.7.0/src/IECore/MemoryIndexedIO.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MemoryIndexedIO.cpp rename to cortex-9.7.0/src/IECore/MemoryIndexedIO.cpp diff --git a/cortex-9.6.0/src/IECore/MemoryStream.cpp b/cortex-9.7.0/src/IECore/MemoryStream.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MemoryStream.cpp rename to cortex-9.7.0/src/IECore/MemoryStream.cpp diff --git a/cortex-9.6.0/src/IECore/MeshDistortionsOp.cpp b/cortex-9.7.0/src/IECore/MeshDistortionsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshDistortionsOp.cpp rename to cortex-9.7.0/src/IECore/MeshDistortionsOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshFaceFilterOp.cpp b/cortex-9.7.0/src/IECore/MeshFaceFilterOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshFaceFilterOp.cpp rename to cortex-9.7.0/src/IECore/MeshFaceFilterOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshMergeOp.cpp b/cortex-9.7.0/src/IECore/MeshMergeOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshMergeOp.cpp rename to cortex-9.7.0/src/IECore/MeshMergeOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshNormalsOp.cpp b/cortex-9.7.0/src/IECore/MeshNormalsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshNormalsOp.cpp rename to cortex-9.7.0/src/IECore/MeshNormalsOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshPrimitive.cpp b/cortex-9.7.0/src/IECore/MeshPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshPrimitive.cpp rename to cortex-9.7.0/src/IECore/MeshPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/MeshPrimitiveBuilder.cpp b/cortex-9.7.0/src/IECore/MeshPrimitiveBuilder.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshPrimitiveBuilder.cpp rename to cortex-9.7.0/src/IECore/MeshPrimitiveBuilder.cpp diff --git a/cortex-9.6.0/src/IECore/MeshPrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/MeshPrimitiveEvaluator.cpp similarity index 99% rename from cortex-9.6.0/src/IECore/MeshPrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/MeshPrimitiveEvaluator.cpp index 57fc3d077c..5137971750 100644 --- a/cortex-9.6.0/src/IECore/MeshPrimitiveEvaluator.cpp +++ b/cortex-9.7.0/src/IECore/MeshPrimitiveEvaluator.cpp @@ -843,7 +843,7 @@ int MeshPrimitiveEvaluator::intersectionPoints( const Imath::V3f &origin, const bool MeshPrimitiveEvaluator::barycentricPosition( unsigned int triangleIndex, const Imath::V3f &barycentricCoordinates, PrimitiveEvaluator::Result *result ) const { - if( triangleIndex > m_triangles.size() ) + if( triangleIndex >= m_triangles.size() ) { return false; } diff --git a/cortex-9.6.0/src/IECore/MeshPrimitiveShrinkWrapOp.cpp b/cortex-9.7.0/src/IECore/MeshPrimitiveShrinkWrapOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshPrimitiveShrinkWrapOp.cpp rename to cortex-9.7.0/src/IECore/MeshPrimitiveShrinkWrapOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshTangentsOp.cpp b/cortex-9.7.0/src/IECore/MeshTangentsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshTangentsOp.cpp rename to cortex-9.7.0/src/IECore/MeshTangentsOp.cpp diff --git a/cortex-9.6.0/src/IECore/MeshVertexReorderOp.cpp b/cortex-9.7.0/src/IECore/MeshVertexReorderOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MeshVertexReorderOp.cpp rename to cortex-9.7.0/src/IECore/MeshVertexReorderOp.cpp diff --git a/cortex-9.6.0/src/IECore/MessageHandler.cpp b/cortex-9.7.0/src/IECore/MessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MessageHandler.cpp rename to cortex-9.7.0/src/IECore/MessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/MixSmoothSkinningWeightsOp.cpp b/cortex-9.7.0/src/IECore/MixSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MixSmoothSkinningWeightsOp.cpp rename to cortex-9.7.0/src/IECore/MixSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.6.0/src/IECore/ModifyOp.cpp b/cortex-9.7.0/src/IECore/ModifyOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ModifyOp.cpp rename to cortex-9.7.0/src/IECore/ModifyOp.cpp diff --git a/cortex-9.6.0/src/IECore/MotionBlock.cpp b/cortex-9.7.0/src/IECore/MotionBlock.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MotionBlock.cpp rename to cortex-9.7.0/src/IECore/MotionBlock.cpp diff --git a/cortex-9.6.0/src/IECore/MotionPrimitive.cpp b/cortex-9.7.0/src/IECore/MotionPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MotionPrimitive.cpp rename to cortex-9.7.0/src/IECore/MotionPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/MurmurHash.cpp b/cortex-9.7.0/src/IECore/MurmurHash.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/MurmurHash.cpp rename to cortex-9.7.0/src/IECore/MurmurHash.cpp diff --git a/cortex-9.6.0/src/IECore/NParticleReader.cpp b/cortex-9.7.0/src/IECore/NParticleReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NParticleReader.cpp rename to cortex-9.7.0/src/IECore/NParticleReader.cpp diff --git a/cortex-9.6.0/src/IECore/NURBSPrimitive.cpp b/cortex-9.7.0/src/IECore/NURBSPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NURBSPrimitive.cpp rename to cortex-9.7.0/src/IECore/NURBSPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp b/cortex-9.7.0/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp rename to cortex-9.7.0/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.6.0/src/IECore/NullMessageHandler.cpp b/cortex-9.7.0/src/IECore/NullMessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NullMessageHandler.cpp rename to cortex-9.7.0/src/IECore/NullMessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/NullObject.cpp b/cortex-9.7.0/src/IECore/NullObject.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NullObject.cpp rename to cortex-9.7.0/src/IECore/NullObject.cpp diff --git a/cortex-9.6.0/src/IECore/NumericParameter.cpp b/cortex-9.7.0/src/IECore/NumericParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/NumericParameter.cpp rename to cortex-9.7.0/src/IECore/NumericParameter.cpp diff --git a/cortex-9.6.0/src/IECore/OBJReader.cpp b/cortex-9.7.0/src/IECore/OBJReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/OBJReader.cpp rename to cortex-9.7.0/src/IECore/OBJReader.cpp diff --git a/cortex-9.6.0/src/IECore/OStreamMessageHandler.cpp b/cortex-9.7.0/src/IECore/OStreamMessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/OStreamMessageHandler.cpp rename to cortex-9.7.0/src/IECore/OStreamMessageHandler.cpp diff --git a/cortex-9.6.0/src/IECore/Object.cpp b/cortex-9.7.0/src/IECore/Object.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Object.cpp rename to cortex-9.7.0/src/IECore/Object.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectInterpolator.cpp b/cortex-9.7.0/src/IECore/ObjectInterpolator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectInterpolator.cpp rename to cortex-9.7.0/src/IECore/ObjectInterpolator.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectParameter.cpp b/cortex-9.7.0/src/IECore/ObjectParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectParameter.cpp rename to cortex-9.7.0/src/IECore/ObjectParameter.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectPool.cpp b/cortex-9.7.0/src/IECore/ObjectPool.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectPool.cpp rename to cortex-9.7.0/src/IECore/ObjectPool.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectReader.cpp b/cortex-9.7.0/src/IECore/ObjectReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectReader.cpp rename to cortex-9.7.0/src/IECore/ObjectReader.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectVector.cpp b/cortex-9.7.0/src/IECore/ObjectVector.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectVector.cpp rename to cortex-9.7.0/src/IECore/ObjectVector.cpp diff --git a/cortex-9.6.0/src/IECore/ObjectWriter.cpp b/cortex-9.7.0/src/IECore/ObjectWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ObjectWriter.cpp rename to cortex-9.7.0/src/IECore/ObjectWriter.cpp diff --git a/cortex-9.6.0/src/IECore/Op.cpp b/cortex-9.7.0/src/IECore/Op.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Op.cpp rename to cortex-9.7.0/src/IECore/Op.cpp diff --git a/cortex-9.6.0/src/IECore/Options.cpp b/cortex-9.7.0/src/IECore/Options.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Options.cpp rename to cortex-9.7.0/src/IECore/Options.cpp diff --git a/cortex-9.6.0/src/IECore/OversamplesCalculator.cpp b/cortex-9.7.0/src/IECore/OversamplesCalculator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/OversamplesCalculator.cpp rename to cortex-9.7.0/src/IECore/OversamplesCalculator.cpp diff --git a/cortex-9.6.0/src/IECore/PDCParticleReader.cpp b/cortex-9.7.0/src/IECore/PDCParticleReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PDCParticleReader.cpp rename to cortex-9.7.0/src/IECore/PDCParticleReader.cpp diff --git a/cortex-9.6.0/src/IECore/PDCParticleWriter.cpp b/cortex-9.7.0/src/IECore/PDCParticleWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PDCParticleWriter.cpp rename to cortex-9.7.0/src/IECore/PDCParticleWriter.cpp diff --git a/cortex-9.6.0/src/IECore/PNGImageReader.cpp b/cortex-9.7.0/src/IECore/PNGImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PNGImageReader.cpp rename to cortex-9.7.0/src/IECore/PNGImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/PanalogToLinearOp.cpp b/cortex-9.7.0/src/IECore/PanalogToLinearOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PanalogToLinearOp.cpp rename to cortex-9.7.0/src/IECore/PanalogToLinearOp.cpp diff --git a/cortex-9.6.0/src/IECore/Parameter.cpp b/cortex-9.7.0/src/IECore/Parameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Parameter.cpp rename to cortex-9.7.0/src/IECore/Parameter.cpp diff --git a/cortex-9.6.0/src/IECore/Parameterised.cpp b/cortex-9.7.0/src/IECore/Parameterised.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Parameterised.cpp rename to cortex-9.7.0/src/IECore/Parameterised.cpp diff --git a/cortex-9.6.0/src/IECore/ParameterisedInterface.cpp b/cortex-9.7.0/src/IECore/ParameterisedInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ParameterisedInterface.cpp rename to cortex-9.7.0/src/IECore/ParameterisedInterface.cpp diff --git a/cortex-9.6.0/src/IECore/ParameterisedProcedural.cpp b/cortex-9.7.0/src/IECore/ParameterisedProcedural.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ParameterisedProcedural.cpp rename to cortex-9.7.0/src/IECore/ParameterisedProcedural.cpp diff --git a/cortex-9.6.0/src/IECore/ParticleReader.cpp b/cortex-9.7.0/src/IECore/ParticleReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ParticleReader.cpp rename to cortex-9.7.0/src/IECore/ParticleReader.cpp diff --git a/cortex-9.6.0/src/IECore/ParticleWriter.cpp b/cortex-9.7.0/src/IECore/ParticleWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ParticleWriter.cpp rename to cortex-9.7.0/src/IECore/ParticleWriter.cpp diff --git a/cortex-9.6.0/src/IECore/PatchMeshPrimitive.cpp b/cortex-9.7.0/src/IECore/PatchMeshPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PatchMeshPrimitive.cpp rename to cortex-9.7.0/src/IECore/PatchMeshPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/PathParameter.cpp b/cortex-9.7.0/src/IECore/PathParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PathParameter.cpp rename to cortex-9.7.0/src/IECore/PathParameter.cpp diff --git a/cortex-9.6.0/src/IECore/PathVectorParameter.cpp b/cortex-9.7.0/src/IECore/PathVectorParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PathVectorParameter.cpp rename to cortex-9.7.0/src/IECore/PathVectorParameter.cpp diff --git a/cortex-9.6.0/src/IECore/PointBoundsOp.cpp b/cortex-9.7.0/src/IECore/PointBoundsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointBoundsOp.cpp rename to cortex-9.7.0/src/IECore/PointBoundsOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointDensitiesOp.cpp b/cortex-9.7.0/src/IECore/PointDensitiesOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointDensitiesOp.cpp rename to cortex-9.7.0/src/IECore/PointDensitiesOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointDistribution.cpp b/cortex-9.7.0/src/IECore/PointDistribution.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointDistribution.cpp rename to cortex-9.7.0/src/IECore/PointDistribution.cpp diff --git a/cortex-9.6.0/src/IECore/PointDistributionOp.cpp b/cortex-9.7.0/src/IECore/PointDistributionOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointDistributionOp.cpp rename to cortex-9.7.0/src/IECore/PointDistributionOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointNormalsOp.cpp b/cortex-9.7.0/src/IECore/PointNormalsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointNormalsOp.cpp rename to cortex-9.7.0/src/IECore/PointNormalsOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointRepulsionOp.cpp b/cortex-9.7.0/src/IECore/PointRepulsionOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointRepulsionOp.cpp rename to cortex-9.7.0/src/IECore/PointRepulsionOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointSmoothSkinningOp.cpp b/cortex-9.7.0/src/IECore/PointSmoothSkinningOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointSmoothSkinningOp.cpp rename to cortex-9.7.0/src/IECore/PointSmoothSkinningOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointVelocityDisplaceOp.cpp b/cortex-9.7.0/src/IECore/PointVelocityDisplaceOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointVelocityDisplaceOp.cpp rename to cortex-9.7.0/src/IECore/PointVelocityDisplaceOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointsMotionOp.cpp b/cortex-9.7.0/src/IECore/PointsMotionOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointsMotionOp.cpp rename to cortex-9.7.0/src/IECore/PointsMotionOp.cpp diff --git a/cortex-9.6.0/src/IECore/PointsPrimitive.cpp b/cortex-9.7.0/src/IECore/PointsPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointsPrimitive.cpp rename to cortex-9.7.0/src/IECore/PointsPrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/PointsPrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/PointsPrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PointsPrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/PointsPrimitiveEvaluator.cpp diff --git a/cortex-9.6.0/src/IECore/PreWorldRenderable.cpp b/cortex-9.7.0/src/IECore/PreWorldRenderable.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PreWorldRenderable.cpp rename to cortex-9.7.0/src/IECore/PreWorldRenderable.cpp diff --git a/cortex-9.6.0/src/IECore/Primitive.cpp b/cortex-9.7.0/src/IECore/Primitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Primitive.cpp rename to cortex-9.7.0/src/IECore/Primitive.cpp diff --git a/cortex-9.6.0/src/IECore/PrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/PrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/PrimitiveEvaluator.cpp diff --git a/cortex-9.6.0/src/IECore/PrimitiveOp.cpp b/cortex-9.7.0/src/IECore/PrimitiveOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PrimitiveOp.cpp rename to cortex-9.7.0/src/IECore/PrimitiveOp.cpp diff --git a/cortex-9.6.0/src/IECore/PrimitiveVariable.cpp b/cortex-9.7.0/src/IECore/PrimitiveVariable.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/PrimitiveVariable.cpp rename to cortex-9.7.0/src/IECore/PrimitiveVariable.cpp diff --git a/cortex-9.6.0/src/IECore/RadixSort.cpp b/cortex-9.7.0/src/IECore/RadixSort.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/RadixSort.cpp rename to cortex-9.7.0/src/IECore/RadixSort.cpp diff --git a/cortex-9.6.0/src/IECore/RandomRotationOp.cpp b/cortex-9.7.0/src/IECore/RandomRotationOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/RandomRotationOp.cpp rename to cortex-9.7.0/src/IECore/RandomRotationOp.cpp diff --git a/cortex-9.6.0/src/IECore/Reader.cpp b/cortex-9.7.0/src/IECore/Reader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Reader.cpp rename to cortex-9.7.0/src/IECore/Reader.cpp diff --git a/cortex-9.6.0/src/IECore/Rec709ToLinearOp.cpp b/cortex-9.7.0/src/IECore/Rec709ToLinearOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Rec709ToLinearOp.cpp rename to cortex-9.7.0/src/IECore/Rec709ToLinearOp.cpp diff --git a/cortex-9.6.0/src/IECore/RefCounted.cpp b/cortex-9.7.0/src/IECore/RefCounted.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/RefCounted.cpp rename to cortex-9.7.0/src/IECore/RefCounted.cpp diff --git a/cortex-9.6.0/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp b/cortex-9.7.0/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp rename to cortex-9.7.0/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.6.0/src/IECore/Renderable.cpp b/cortex-9.7.0/src/IECore/Renderable.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Renderable.cpp rename to cortex-9.7.0/src/IECore/Renderable.cpp diff --git a/cortex-9.6.0/src/IECore/Renderer.cpp b/cortex-9.7.0/src/IECore/Renderer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Renderer.cpp rename to cortex-9.7.0/src/IECore/Renderer.cpp diff --git a/cortex-9.6.0/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp b/cortex-9.7.0/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp rename to cortex-9.7.0/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.6.0/src/IECore/ReorderedFrameList.cpp b/cortex-9.7.0/src/IECore/ReorderedFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ReorderedFrameList.cpp rename to cortex-9.7.0/src/IECore/ReorderedFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/ReversedFrameList.cpp b/cortex-9.7.0/src/IECore/ReversedFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ReversedFrameList.cpp rename to cortex-9.7.0/src/IECore/ReversedFrameList.cpp diff --git a/cortex-9.6.0/src/IECore/RunTimeTyped.cpp b/cortex-9.7.0/src/IECore/RunTimeTyped.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/RunTimeTyped.cpp rename to cortex-9.7.0/src/IECore/RunTimeTyped.cpp diff --git a/cortex-9.6.0/src/IECore/SGIImageReader.cpp b/cortex-9.7.0/src/IECore/SGIImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SGIImageReader.cpp rename to cortex-9.7.0/src/IECore/SGIImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/SRGBToLinearOp.cpp b/cortex-9.7.0/src/IECore/SRGBToLinearOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SRGBToLinearOp.cpp rename to cortex-9.7.0/src/IECore/SRGBToLinearOp.cpp diff --git a/cortex-9.6.0/src/IECore/SampledSceneInterface.cpp b/cortex-9.7.0/src/IECore/SampledSceneInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SampledSceneInterface.cpp rename to cortex-9.7.0/src/IECore/SampledSceneInterface.cpp diff --git a/cortex-9.6.0/src/IECore/SceneCache.cpp b/cortex-9.7.0/src/IECore/SceneCache.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SceneCache.cpp rename to cortex-9.7.0/src/IECore/SceneCache.cpp diff --git a/cortex-9.6.0/src/IECore/SceneInterface.cpp b/cortex-9.7.0/src/IECore/SceneInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SceneInterface.cpp rename to cortex-9.7.0/src/IECore/SceneInterface.cpp diff --git a/cortex-9.6.0/src/IECore/ScopedTIFFErrorHandler.cpp b/cortex-9.7.0/src/IECore/ScopedTIFFErrorHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ScopedTIFFErrorHandler.cpp rename to cortex-9.7.0/src/IECore/ScopedTIFFErrorHandler.cpp diff --git a/cortex-9.6.0/src/IECore/SearchPath.cpp b/cortex-9.7.0/src/IECore/SearchPath.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SearchPath.cpp rename to cortex-9.7.0/src/IECore/SearchPath.cpp diff --git a/cortex-9.6.0/src/IECore/Shader.cpp b/cortex-9.7.0/src/IECore/Shader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Shader.cpp rename to cortex-9.7.0/src/IECore/Shader.cpp diff --git a/cortex-9.6.0/src/IECore/SharedSceneInterfaces.cpp b/cortex-9.7.0/src/IECore/SharedSceneInterfaces.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SharedSceneInterfaces.cpp rename to cortex-9.7.0/src/IECore/SharedSceneInterfaces.cpp diff --git a/cortex-9.6.0/src/IECore/SimpleTypedData.cpp b/cortex-9.7.0/src/IECore/SimpleTypedData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SimpleTypedData.cpp rename to cortex-9.7.0/src/IECore/SimpleTypedData.cpp diff --git a/cortex-9.6.0/src/IECore/SimpleTypedParameter.cpp b/cortex-9.7.0/src/IECore/SimpleTypedParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SimpleTypedParameter.cpp rename to cortex-9.7.0/src/IECore/SimpleTypedParameter.cpp diff --git a/cortex-9.6.0/src/IECore/SmoothSkinningData.cpp b/cortex-9.7.0/src/IECore/SmoothSkinningData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SmoothSkinningData.cpp rename to cortex-9.7.0/src/IECore/SmoothSkinningData.cpp diff --git a/cortex-9.6.0/src/IECore/SmoothSmoothSkinningWeightsOp.cpp b/cortex-9.7.0/src/IECore/SmoothSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SmoothSmoothSkinningWeightsOp.cpp rename to cortex-9.7.0/src/IECore/SmoothSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.6.0/src/IECore/SpherePrimitive.cpp b/cortex-9.7.0/src/IECore/SpherePrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SpherePrimitive.cpp rename to cortex-9.7.0/src/IECore/SpherePrimitive.cpp diff --git a/cortex-9.6.0/src/IECore/SpherePrimitiveEvaluator.cpp b/cortex-9.7.0/src/IECore/SpherePrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SpherePrimitiveEvaluator.cpp rename to cortex-9.7.0/src/IECore/SpherePrimitiveEvaluator.cpp diff --git a/cortex-9.6.0/src/IECore/SplineData.cpp b/cortex-9.7.0/src/IECore/SplineData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SplineData.cpp rename to cortex-9.7.0/src/IECore/SplineData.cpp diff --git a/cortex-9.6.0/src/IECore/SplineParameter.cpp b/cortex-9.7.0/src/IECore/SplineParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SplineParameter.cpp rename to cortex-9.7.0/src/IECore/SplineParameter.cpp diff --git a/cortex-9.6.0/src/IECore/SplineToImage.cpp b/cortex-9.7.0/src/IECore/SplineToImage.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SplineToImage.cpp rename to cortex-9.7.0/src/IECore/SplineToImage.cpp diff --git a/cortex-9.6.0/src/IECore/StandardRadialLensModel.cpp b/cortex-9.7.0/src/IECore/StandardRadialLensModel.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/StandardRadialLensModel.cpp rename to cortex-9.7.0/src/IECore/StandardRadialLensModel.cpp diff --git a/cortex-9.6.0/src/IECore/StateRenderable.cpp b/cortex-9.7.0/src/IECore/StateRenderable.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/StateRenderable.cpp rename to cortex-9.7.0/src/IECore/StateRenderable.cpp diff --git a/cortex-9.6.0/src/IECore/StreamIndexedIO.cpp b/cortex-9.7.0/src/IECore/StreamIndexedIO.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/StreamIndexedIO.cpp rename to cortex-9.7.0/src/IECore/StreamIndexedIO.cpp diff --git a/cortex-9.6.0/src/IECore/SummedAreaOp.cpp b/cortex-9.7.0/src/IECore/SummedAreaOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/SummedAreaOp.cpp rename to cortex-9.7.0/src/IECore/SummedAreaOp.cpp diff --git a/cortex-9.6.0/src/IECore/TGAImageReader.cpp b/cortex-9.7.0/src/IECore/TGAImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TGAImageReader.cpp rename to cortex-9.7.0/src/IECore/TGAImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/TGAImageWriter.cpp b/cortex-9.7.0/src/IECore/TGAImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TGAImageWriter.cpp rename to cortex-9.7.0/src/IECore/TGAImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/TIFFImageReader.cpp b/cortex-9.7.0/src/IECore/TIFFImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TIFFImageReader.cpp rename to cortex-9.7.0/src/IECore/TIFFImageReader.cpp diff --git a/cortex-9.6.0/src/IECore/TIFFImageWriter.cpp b/cortex-9.7.0/src/IECore/TIFFImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TIFFImageWriter.cpp rename to cortex-9.7.0/src/IECore/TIFFImageWriter.cpp diff --git a/cortex-9.6.0/src/IECore/TimeCodeData.cpp b/cortex-9.7.0/src/IECore/TimeCodeData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimeCodeData.cpp rename to cortex-9.7.0/src/IECore/TimeCodeData.cpp diff --git a/cortex-9.6.0/src/IECore/TimeCodeParameter.cpp b/cortex-9.7.0/src/IECore/TimeCodeParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimeCodeParameter.cpp rename to cortex-9.7.0/src/IECore/TimeCodeParameter.cpp diff --git a/cortex-9.6.0/src/IECore/TimeDurationData.cpp b/cortex-9.7.0/src/IECore/TimeDurationData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimeDurationData.cpp rename to cortex-9.7.0/src/IECore/TimeDurationData.cpp diff --git a/cortex-9.6.0/src/IECore/TimeDurationParameter.cpp b/cortex-9.7.0/src/IECore/TimeDurationParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimeDurationParameter.cpp rename to cortex-9.7.0/src/IECore/TimeDurationParameter.cpp diff --git a/cortex-9.6.0/src/IECore/TimePeriod.cpp b/cortex-9.7.0/src/IECore/TimePeriod.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimePeriod.cpp rename to cortex-9.7.0/src/IECore/TimePeriod.cpp diff --git a/cortex-9.6.0/src/IECore/TimePeriodData.cpp b/cortex-9.7.0/src/IECore/TimePeriodData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimePeriodData.cpp rename to cortex-9.7.0/src/IECore/TimePeriodData.cpp diff --git a/cortex-9.6.0/src/IECore/TimePeriodParameter.cpp b/cortex-9.7.0/src/IECore/TimePeriodParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TimePeriodParameter.cpp rename to cortex-9.7.0/src/IECore/TimePeriodParameter.cpp diff --git a/cortex-9.6.0/src/IECore/Timer.cpp b/cortex-9.7.0/src/IECore/Timer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Timer.cpp rename to cortex-9.7.0/src/IECore/Timer.cpp diff --git a/cortex-9.6.0/src/IECore/ToCoreConverter.cpp b/cortex-9.7.0/src/IECore/ToCoreConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ToCoreConverter.cpp rename to cortex-9.7.0/src/IECore/ToCoreConverter.cpp diff --git a/cortex-9.6.0/src/IECore/TransferSmoothSkinningWeightsOp.cpp b/cortex-9.7.0/src/IECore/TransferSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TransferSmoothSkinningWeightsOp.cpp rename to cortex-9.7.0/src/IECore/TransferSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.6.0/src/IECore/Transform.cpp b/cortex-9.7.0/src/IECore/Transform.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Transform.cpp rename to cortex-9.7.0/src/IECore/Transform.cpp diff --git a/cortex-9.6.0/src/IECore/TransformBlock.cpp b/cortex-9.7.0/src/IECore/TransformBlock.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TransformBlock.cpp rename to cortex-9.7.0/src/IECore/TransformBlock.cpp diff --git a/cortex-9.6.0/src/IECore/TransformOp.cpp b/cortex-9.7.0/src/IECore/TransformOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TransformOp.cpp rename to cortex-9.7.0/src/IECore/TransformOp.cpp diff --git a/cortex-9.6.0/src/IECoreRI/TransformStack.cpp b/cortex-9.7.0/src/IECore/TransformStack.cpp similarity index 92% rename from cortex-9.6.0/src/IECoreRI/TransformStack.cpp rename to cortex-9.7.0/src/IECore/TransformStack.cpp index 26f33fbe41..fd9ecaef1e 100644 --- a/cortex-9.6.0/src/IECoreRI/TransformStack.cpp +++ b/cortex-9.7.0/src/IECore/TransformStack.cpp @@ -37,11 +37,10 @@ #include "IECore/Exception.h" #include "IECore/Interpolator.h" -#include "IECoreRI/private/TransformStack.h" +#include "IECore/private/TransformStack.h" using namespace Imath; using namespace IECore; -using namespace IECoreRI; TransformStack::TransformStack() : m_motionIndex( -1 ) // not in motion block @@ -49,6 +48,19 @@ TransformStack::TransformStack() m_stack.push( Samples( 1, Sample( 0.0f, Imath::M44f() ) ) ); } +TransformStack::TransformStack( const TransformStack &other, bool flatten ) + : m_motionIndex( other.m_motionIndex ) +{ + if( flatten ) + { + m_stack.push( other.m_stack.top() ); + } + else + { + m_stack = other.m_stack; + } +} + void TransformStack::push() { m_stack.push( m_stack.top() ); @@ -77,7 +89,7 @@ void TransformStack::motionBegin( const std::vector × ) newSamples.push_back( Sample( *it, get( *it ) ) ); } m_stack.top() = newSamples; - + m_motionIndex = 0; } @@ -86,6 +98,11 @@ void TransformStack::motionEnd() m_motionIndex = -1; } +bool TransformStack::inMotion() const +{ + return m_motionIndex >= 0; +} + void TransformStack::set( const Imath::M44f &matrix ) { Samples &samples = m_stack.top(); @@ -93,7 +110,7 @@ void TransformStack::set( const Imath::M44f &matrix ) { if( m_motionIndex >= (int)samples.size() ) { - throw Exception( "TransformStack::set() called too many times for motion block" ); + throw Exception( "TransformStack::set() called too many times for motion block" ); } samples[m_motionIndex++].matrix = matrix; } @@ -113,7 +130,7 @@ void TransformStack::concatenate( const Imath::M44f &matrix ) { if( m_motionIndex >= (int)samples.size() ) { - throw Exception( "TransformStack::concatenate() called too many times for motion block" ); + throw Exception( "TransformStack::concatenate() called too many times for motion block" ); } samples[m_motionIndex].matrix = matrix * samples[m_motionIndex].matrix; m_motionIndex++; @@ -139,9 +156,9 @@ Imath::M44f TransformStack::get( float time ) const { return samples[0].matrix; } - + // interpolate. find the first sample where sample.time >= time. - + Samples::const_iterator s1 = lower_bound( samples.begin(), samples.end(), time ); if( s1 == samples.begin() || s1->time == time ) { @@ -158,7 +175,7 @@ Imath::M44f TransformStack::get( float time ) const M44f result; LinearInterpolator()( s0->matrix, s1->matrix, l, result ); return result; - } + } } size_t TransformStack::numSamples() const diff --git a/cortex-9.6.0/src/IECore/TransformationMatrix.cpp b/cortex-9.7.0/src/IECore/TransformationMatrix.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TransformationMatrix.cpp rename to cortex-9.7.0/src/IECore/TransformationMatrix.cpp diff --git a/cortex-9.6.0/src/IECore/TransformationMatrixData.cpp b/cortex-9.7.0/src/IECore/TransformationMatrixData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TransformationMatrixData.cpp rename to cortex-9.7.0/src/IECore/TransformationMatrixData.cpp diff --git a/cortex-9.6.0/src/IECore/TriangulateOp.cpp b/cortex-9.7.0/src/IECore/TriangulateOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TriangulateOp.cpp rename to cortex-9.7.0/src/IECore/TriangulateOp.cpp diff --git a/cortex-9.6.0/src/IECore/TypedObjectParameter.cpp b/cortex-9.7.0/src/IECore/TypedObjectParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TypedObjectParameter.cpp rename to cortex-9.7.0/src/IECore/TypedObjectParameter.cpp diff --git a/cortex-9.6.0/src/IECore/TypedPrimitiveOp.cpp b/cortex-9.7.0/src/IECore/TypedPrimitiveOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TypedPrimitiveOp.cpp rename to cortex-9.7.0/src/IECore/TypedPrimitiveOp.cpp diff --git a/cortex-9.6.0/src/IECore/TypedPrimitiveParameter.cpp b/cortex-9.7.0/src/IECore/TypedPrimitiveParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/TypedPrimitiveParameter.cpp rename to cortex-9.7.0/src/IECore/TypedPrimitiveParameter.cpp diff --git a/cortex-9.6.0/src/IECore/UVDistortOp.cpp b/cortex-9.7.0/src/IECore/UVDistortOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/UVDistortOp.cpp rename to cortex-9.7.0/src/IECore/UVDistortOp.cpp diff --git a/cortex-9.6.0/src/IECore/ValidatedStringParameter.cpp b/cortex-9.7.0/src/IECore/ValidatedStringParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/ValidatedStringParameter.cpp rename to cortex-9.7.0/src/IECore/ValidatedStringParameter.cpp diff --git a/cortex-9.6.0/src/IECore/VectorDataFilterOp.cpp b/cortex-9.7.0/src/IECore/VectorDataFilterOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/VectorDataFilterOp.cpp rename to cortex-9.7.0/src/IECore/VectorDataFilterOp.cpp diff --git a/cortex-9.6.0/src/IECore/VectorTypedData.cpp b/cortex-9.7.0/src/IECore/VectorTypedData.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/VectorTypedData.cpp rename to cortex-9.7.0/src/IECore/VectorTypedData.cpp diff --git a/cortex-9.6.0/src/IECore/VectorTypedParameter.cpp b/cortex-9.7.0/src/IECore/VectorTypedParameter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/VectorTypedParameter.cpp rename to cortex-9.7.0/src/IECore/VectorTypedParameter.cpp diff --git a/cortex-9.6.0/src/IECore/VisibleRenderable.cpp b/cortex-9.7.0/src/IECore/VisibleRenderable.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/VisibleRenderable.cpp rename to cortex-9.7.0/src/IECore/VisibleRenderable.cpp diff --git a/cortex-9.6.0/src/IECore/WarpOp.cpp b/cortex-9.7.0/src/IECore/WarpOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/WarpOp.cpp rename to cortex-9.7.0/src/IECore/WarpOp.cpp diff --git a/cortex-9.6.0/src/IECore/WorldBlock.cpp b/cortex-9.7.0/src/IECore/WorldBlock.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/WorldBlock.cpp rename to cortex-9.7.0/src/IECore/WorldBlock.cpp diff --git a/cortex-9.6.0/src/IECore/Writer.cpp b/cortex-9.7.0/src/IECore/Writer.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/Writer.cpp rename to cortex-9.7.0/src/IECore/Writer.cpp diff --git a/cortex-9.6.0/src/IECore/YUVImageWriter.cpp b/cortex-9.7.0/src/IECore/YUVImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECore/YUVImageWriter.cpp rename to cortex-9.7.0/src/IECore/YUVImageWriter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/AlphaTexture.cpp b/cortex-9.7.0/src/IECoreGL/AlphaTexture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/AlphaTexture.cpp rename to cortex-9.7.0/src/IECoreGL/AlphaTexture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Bindable.cpp b/cortex-9.7.0/src/IECoreGL/Bindable.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Bindable.cpp rename to cortex-9.7.0/src/IECoreGL/Bindable.cpp diff --git a/cortex-9.6.0/src/IECoreGL/BoxPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/BoxPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/BoxPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/BoxPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Buffer.cpp b/cortex-9.7.0/src/IECoreGL/Buffer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Buffer.cpp rename to cortex-9.7.0/src/IECoreGL/Buffer.cpp diff --git a/cortex-9.6.0/src/IECoreGL/CachedConverter.cpp b/cortex-9.7.0/src/IECoreGL/CachedConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/CachedConverter.cpp rename to cortex-9.7.0/src/IECoreGL/CachedConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Camera.cpp b/cortex-9.7.0/src/IECoreGL/Camera.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Camera.cpp rename to cortex-9.7.0/src/IECoreGL/Camera.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ColorTexture.cpp b/cortex-9.7.0/src/IECoreGL/ColorTexture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ColorTexture.cpp rename to cortex-9.7.0/src/IECoreGL/ColorTexture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/CurvesPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/CurvesPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/CurvesPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/CurvesPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Debug.cpp b/cortex-9.7.0/src/IECoreGL/Debug.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Debug.cpp rename to cortex-9.7.0/src/IECoreGL/Debug.cpp diff --git a/cortex-9.6.0/src/IECoreGL/DeferredRendererImplementation.cpp b/cortex-9.7.0/src/IECoreGL/DeferredRendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/DeferredRendererImplementation.cpp rename to cortex-9.7.0/src/IECoreGL/DeferredRendererImplementation.cpp diff --git a/cortex-9.6.0/src/IECoreGL/DepthTexture.cpp b/cortex-9.7.0/src/IECoreGL/DepthTexture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/DepthTexture.cpp rename to cortex-9.7.0/src/IECoreGL/DepthTexture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/DiskPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/DiskPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/DiskPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/DiskPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Display.cpp b/cortex-9.7.0/src/IECoreGL/Display.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Display.cpp rename to cortex-9.7.0/src/IECoreGL/Display.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Exception.cpp b/cortex-9.7.0/src/IECoreGL/Exception.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Exception.cpp rename to cortex-9.7.0/src/IECoreGL/Exception.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Font.cpp b/cortex-9.7.0/src/IECoreGL/Font.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Font.cpp rename to cortex-9.7.0/src/IECoreGL/Font.cpp diff --git a/cortex-9.6.0/src/IECoreGL/FontLoader.cpp b/cortex-9.7.0/src/IECoreGL/FontLoader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/FontLoader.cpp rename to cortex-9.7.0/src/IECoreGL/FontLoader.cpp diff --git a/cortex-9.6.0/src/IECoreGL/FrameBuffer.cpp b/cortex-9.7.0/src/IECoreGL/FrameBuffer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/FrameBuffer.cpp rename to cortex-9.7.0/src/IECoreGL/FrameBuffer.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Group.cpp b/cortex-9.7.0/src/IECoreGL/Group.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Group.cpp rename to cortex-9.7.0/src/IECoreGL/Group.cpp diff --git a/cortex-9.6.0/src/IECoreGL/HitRecord.cpp b/cortex-9.7.0/src/IECoreGL/HitRecord.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/HitRecord.cpp rename to cortex-9.7.0/src/IECoreGL/HitRecord.cpp diff --git a/cortex-9.6.0/src/IECoreGL/IECoreGL.cpp b/cortex-9.7.0/src/IECoreGL/IECoreGL.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/IECoreGL.cpp rename to cortex-9.7.0/src/IECoreGL/IECoreGL.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ImmediateRendererImplementation.cpp b/cortex-9.7.0/src/IECoreGL/ImmediateRendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ImmediateRendererImplementation.cpp rename to cortex-9.7.0/src/IECoreGL/ImmediateRendererImplementation.cpp diff --git a/cortex-9.6.0/src/IECoreGL/LuminanceTexture.cpp b/cortex-9.7.0/src/IECoreGL/LuminanceTexture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/LuminanceTexture.cpp rename to cortex-9.7.0/src/IECoreGL/LuminanceTexture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/MeshPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/MeshPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/MeshPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/MeshPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/NameStateComponent.cpp b/cortex-9.7.0/src/IECoreGL/NameStateComponent.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/NameStateComponent.cpp rename to cortex-9.7.0/src/IECoreGL/NameStateComponent.cpp diff --git a/cortex-9.6.0/src/IECoreGL/NumericTraits.cpp b/cortex-9.7.0/src/IECoreGL/NumericTraits.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/NumericTraits.cpp rename to cortex-9.7.0/src/IECoreGL/NumericTraits.cpp diff --git a/cortex-9.6.0/src/IECoreGL/OrthographicCamera.cpp b/cortex-9.7.0/src/IECoreGL/OrthographicCamera.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/OrthographicCamera.cpp rename to cortex-9.7.0/src/IECoreGL/OrthographicCamera.cpp diff --git a/cortex-9.6.0/src/IECoreGL/PerspectiveCamera.cpp b/cortex-9.7.0/src/IECoreGL/PerspectiveCamera.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/PerspectiveCamera.cpp rename to cortex-9.7.0/src/IECoreGL/PerspectiveCamera.cpp diff --git a/cortex-9.6.0/src/IECoreGL/PointsPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/PointsPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/PointsPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/PointsPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Primitive.cpp b/cortex-9.7.0/src/IECoreGL/Primitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Primitive.cpp rename to cortex-9.7.0/src/IECoreGL/Primitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/QuadPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/QuadPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/QuadPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/QuadPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Renderable.cpp b/cortex-9.7.0/src/IECoreGL/Renderable.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Renderable.cpp rename to cortex-9.7.0/src/IECoreGL/Renderable.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Renderer.cpp b/cortex-9.7.0/src/IECoreGL/Renderer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Renderer.cpp rename to cortex-9.7.0/src/IECoreGL/Renderer.cpp diff --git a/cortex-9.6.0/src/IECoreGL/RendererImplementation.cpp b/cortex-9.7.0/src/IECoreGL/RendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/RendererImplementation.cpp rename to cortex-9.7.0/src/IECoreGL/RendererImplementation.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Scene.cpp b/cortex-9.7.0/src/IECoreGL/Scene.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Scene.cpp rename to cortex-9.7.0/src/IECoreGL/Scene.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Selector.cpp b/cortex-9.7.0/src/IECoreGL/Selector.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Selector.cpp rename to cortex-9.7.0/src/IECoreGL/Selector.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Shader.cpp b/cortex-9.7.0/src/IECoreGL/Shader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Shader.cpp rename to cortex-9.7.0/src/IECoreGL/Shader.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ShaderLoader.cpp b/cortex-9.7.0/src/IECoreGL/ShaderLoader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ShaderLoader.cpp rename to cortex-9.7.0/src/IECoreGL/ShaderLoader.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ShaderStateComponent.cpp b/cortex-9.7.0/src/IECoreGL/ShaderStateComponent.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ShaderStateComponent.cpp rename to cortex-9.7.0/src/IECoreGL/ShaderStateComponent.cpp diff --git a/cortex-9.6.0/src/IECoreGL/SpherePrimitive.cpp b/cortex-9.7.0/src/IECoreGL/SpherePrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/SpherePrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/SpherePrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/SplineToGLTextureConverter.cpp b/cortex-9.7.0/src/IECoreGL/SplineToGLTextureConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/SplineToGLTextureConverter.cpp rename to cortex-9.7.0/src/IECoreGL/SplineToGLTextureConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/State.cpp b/cortex-9.7.0/src/IECoreGL/State.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/State.cpp rename to cortex-9.7.0/src/IECoreGL/State.cpp diff --git a/cortex-9.6.0/src/IECoreGL/StateComponent.cpp b/cortex-9.7.0/src/IECoreGL/StateComponent.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/StateComponent.cpp rename to cortex-9.7.0/src/IECoreGL/StateComponent.cpp diff --git a/cortex-9.6.0/src/IECoreGL/TextPrimitive.cpp b/cortex-9.7.0/src/IECoreGL/TextPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/TextPrimitive.cpp rename to cortex-9.7.0/src/IECoreGL/TextPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreGL/Texture.cpp b/cortex-9.7.0/src/IECoreGL/Texture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/Texture.cpp rename to cortex-9.7.0/src/IECoreGL/Texture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/TextureLoader.cpp b/cortex-9.7.0/src/IECoreGL/TextureLoader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/TextureLoader.cpp rename to cortex-9.7.0/src/IECoreGL/TextureLoader.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLBufferConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLBufferConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLBufferConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLBufferConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLCameraConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLCameraConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLCameraConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLCurvesConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLCurvesConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLCurvesConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLCurvesConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLMeshConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLMeshConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLMeshConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLMeshConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLPointsConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLPointsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLPointsConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLPointsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLSphereConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLSphereConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLSphereConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLSphereConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLStateConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLStateConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLStateConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLStateConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/ToGLTextureConverter.cpp b/cortex-9.7.0/src/IECoreGL/ToGLTextureConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/ToGLTextureConverter.cpp rename to cortex-9.7.0/src/IECoreGL/ToGLTextureConverter.cpp diff --git a/cortex-9.6.0/src/IECoreGL/TypedStateComponent.cpp b/cortex-9.7.0/src/IECoreGL/TypedStateComponent.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/TypedStateComponent.cpp rename to cortex-9.7.0/src/IECoreGL/TypedStateComponent.cpp diff --git a/cortex-9.6.0/src/IECoreGL/UIntTexture.cpp b/cortex-9.7.0/src/IECoreGL/UIntTexture.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/UIntTexture.cpp rename to cortex-9.7.0/src/IECoreGL/UIntTexture.cpp diff --git a/cortex-9.6.0/src/IECoreGL/UniformFunctions.cpp b/cortex-9.7.0/src/IECoreGL/UniformFunctions.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/UniformFunctions.cpp rename to cortex-9.7.0/src/IECoreGL/UniformFunctions.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/AlphaTextureBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/AlphaTextureBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/AlphaTextureBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/AlphaTextureBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/BindableBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/BindableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/BindableBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/BindableBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/BufferBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/BufferBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/BufferBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/BufferBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/CachedConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/CachedConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/CachedConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/CachedConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/CameraBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/CameraBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/CameraBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/CameraBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ColorTextureBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ColorTextureBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ColorTextureBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ColorTextureBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/DepthTextureBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/DepthTextureBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/DepthTextureBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/DepthTextureBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/FontBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/FontBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/FontBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/FontBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/FontLoaderBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/FontLoaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/FontLoaderBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/FontLoaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/FrameBufferBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/FrameBufferBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/FrameBufferBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/FrameBufferBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/GroupBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/GroupBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/GroupBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/GroupBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/HitRecordBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/HitRecordBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/HitRecordBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/HitRecordBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/IECoreGLBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/IECoreGLBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/IECoreGLBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/IECoreGLBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/LuminanceTextureBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/LuminanceTextureBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/LuminanceTextureBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/LuminanceTextureBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/NameStateComponentBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/NameStateComponentBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/NameStateComponentBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/NameStateComponentBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/OrthographicCameraBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/OrthographicCameraBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/OrthographicCameraBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/OrthographicCameraBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/PrimitiveBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/PrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/PrimitiveBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/PrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/RenderableBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/RenderableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/RenderableBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/RenderableBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/RendererBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/RendererBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/RendererBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/SceneBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/SceneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/SceneBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/SceneBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/SelectorBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/SelectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/SelectorBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/SelectorBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ShaderBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ShaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ShaderBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ShaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ShaderLoaderBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ShaderLoaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ShaderLoaderBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ShaderLoaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/StateBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/StateBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/StateBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/StateBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/StateComponentBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/StateComponentBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/StateComponentBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/StateComponentBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/TextureBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/TextureBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/TextureBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/TextureBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/TextureLoaderBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/TextureLoaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/TextureLoaderBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/TextureLoaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreGL/bindings/TypedStateComponentBinding.cpp b/cortex-9.7.0/src/IECoreGL/bindings/TypedStateComponentBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreGL/bindings/TypedStateComponentBinding.cpp rename to cortex-9.7.0/src/IECoreGL/bindings/TypedStateComponentBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/Convert.cpp b/cortex-9.7.0/src/IECoreHoudini/Convert.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/Convert.cpp rename to cortex-9.7.0/src/IECoreHoudini/Convert.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/CoreHoudini.cpp b/cortex-9.7.0/src/IECoreHoudini/CoreHoudini.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/CoreHoudini.cpp rename to cortex-9.7.0/src/IECoreHoudini/CoreHoudini.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/DetailSplitter.cpp b/cortex-9.7.0/src/IECoreHoudini/DetailSplitter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/DetailSplitter.cpp rename to cortex-9.7.0/src/IECoreHoudini/DetailSplitter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FnParameterisedHolder.cpp b/cortex-9.7.0/src/IECoreHoudini/FnParameterisedHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FnParameterisedHolder.cpp rename to cortex-9.7.0/src/IECoreHoudini/FnParameterisedHolder.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniGroupConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniGroupConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniGroupConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniGroupConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniPointsConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniPointsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniPointsConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniPointsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GEO_CobIOTranslator.cpp b/cortex-9.7.0/src/IECoreHoudini/GEO_CobIOTranslator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GEO_CobIOTranslator.cpp rename to cortex-9.7.0/src/IECoreHoudini/GEO_CobIOTranslator.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GEO_CortexPrimitive.cpp b/cortex-9.7.0/src/IECoreHoudini/GEO_CortexPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GEO_CortexPrimitive.cpp rename to cortex-9.7.0/src/IECoreHoudini/GEO_CortexPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GR_Cortex.cpp b/cortex-9.7.0/src/IECoreHoudini/GR_Cortex.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GR_Cortex.cpp rename to cortex-9.7.0/src/IECoreHoudini/GR_Cortex.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GR_CortexPrimitive.cpp b/cortex-9.7.0/src/IECoreHoudini/GR_CortexPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GR_CortexPrimitive.cpp rename to cortex-9.7.0/src/IECoreHoudini/GR_CortexPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp b/cortex-9.7.0/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp rename to cortex-9.7.0/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/GU_CortexPrimitive.cpp b/cortex-9.7.0/src/IECoreHoudini/GU_CortexPrimitive.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/GU_CortexPrimitive.cpp rename to cortex-9.7.0/src/IECoreHoudini/GU_CortexPrimitive.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/HoudiniHeaderGenerator.cpp b/cortex-9.7.0/src/IECoreHoudini/HoudiniHeaderGenerator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/HoudiniHeaderGenerator.cpp rename to cortex-9.7.0/src/IECoreHoudini/HoudiniHeaderGenerator.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/LiveScene.cpp b/cortex-9.7.0/src/IECoreHoudini/LiveScene.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/LiveScene.cpp rename to cortex-9.7.0/src/IECoreHoudini/LiveScene.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/MessageHandler.cpp b/cortex-9.7.0/src/IECoreHoudini/MessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/MessageHandler.cpp rename to cortex-9.7.0/src/IECoreHoudini/MessageHandler.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/NodeHandle.cpp b/cortex-9.7.0/src/IECoreHoudini/NodeHandle.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/NodeHandle.cpp rename to cortex-9.7.0/src/IECoreHoudini/NodeHandle.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp b/cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp rename to cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheNode.cpp b/cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheNode.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheNode.cpp rename to cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheNode.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp b/cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp rename to cortex-9.7.0/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ParameterisedHolder.cpp b/cortex-9.7.0/src/IECoreHoudini/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ParameterisedHolder.cpp rename to cortex-9.7.0/src/IECoreHoudini/ParameterisedHolder.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ParameterisedHolderInterface.cpp b/cortex-9.7.0/src/IECoreHoudini/ParameterisedHolderInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ParameterisedHolderInterface.cpp rename to cortex-9.7.0/src/IECoreHoudini/ParameterisedHolderInterface.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/RATDeepImageReader.cpp b/cortex-9.7.0/src/IECoreHoudini/RATDeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/RATDeepImageReader.cpp rename to cortex-9.7.0/src/IECoreHoudini/RATDeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/RATDeepImageWriter.cpp b/cortex-9.7.0/src/IECoreHoudini/RATDeepImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/RATDeepImageWriter.cpp rename to cortex-9.7.0/src/IECoreHoudini/RATDeepImageWriter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ROP_SceneCacheWriter.cpp b/cortex-9.7.0/src/IECoreHoudini/ROP_SceneCacheWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ROP_SceneCacheWriter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ROP_SceneCacheWriter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_CortexConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_CortexConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_CortexConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_CortexConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_OpHolder.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_OpHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_OpHolder.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_OpHolder.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_ParameterisedHolder.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_ParameterisedHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_ParameterisedHolder.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_ParameterisedHolder.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_ProceduralHolder.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_ProceduralHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_ProceduralHolder.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_ProceduralHolder.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_SceneCacheSource.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_SceneCacheSource.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_SceneCacheSource.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_SceneCacheSource.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SOP_SceneCacheTransform.cpp b/cortex-9.7.0/src/IECoreHoudini/SOP_SceneCacheTransform.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SOP_SceneCacheTransform.cpp rename to cortex-9.7.0/src/IECoreHoudini/SOP_SceneCacheTransform.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/SceneCacheNode.cpp b/cortex-9.7.0/src/IECoreHoudini/SceneCacheNode.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/SceneCacheNode.cpp rename to cortex-9.7.0/src/IECoreHoudini/SceneCacheNode.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniAttribConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniAttribConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniAttribConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniAttribConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniGroupConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniGroupConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniGroupConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniGroupConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniPointsConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniPointsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniPointsConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniPointsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniQuatAttribConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniQuatAttribConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniQuatAttribConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniQuatAttribConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp b/cortex-9.7.0/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp rename to cortex-9.7.0/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/UT_ObjectPoolCache.cpp b/cortex-9.7.0/src/IECoreHoudini/UT_ObjectPoolCache.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/UT_ObjectPoolCache.cpp rename to cortex-9.7.0/src/IECoreHoudini/UT_ObjectPoolCache.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/LiveSceneBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/LiveSceneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/LiveSceneBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/LiveSceneBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/bindings/TypeIdBinding.cpp b/cortex-9.7.0/src/IECoreHoudini/bindings/TypeIdBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/bindings/TypeIdBinding.cpp rename to cortex-9.7.0/src/IECoreHoudini/bindings/TypeIdBinding.cpp diff --git a/cortex-9.6.0/src/IECoreHoudini/plugin/Plugin.cpp b/cortex-9.7.0/src/IECoreHoudini/plugin/Plugin.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreHoudini/plugin/Plugin.cpp rename to cortex-9.7.0/src/IECoreHoudini/plugin/Plugin.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/BoolParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/BoolParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/BoolParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/BoolParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/Box3Manipulator.cpp b/cortex-9.7.0/src/IECoreMaya/Box3Manipulator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/Box3Manipulator.cpp rename to cortex-9.7.0/src/IECoreMaya/Box3Manipulator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/BoxParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/BoxParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/BoxParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/BoxParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/CacheSet.cpp b/cortex-9.7.0/src/IECoreMaya/CacheSet.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/CacheSet.cpp rename to cortex-9.7.0/src/IECoreMaya/CacheSet.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/CallbackId.cpp b/cortex-9.7.0/src/IECoreMaya/CallbackId.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/CallbackId.cpp rename to cortex-9.7.0/src/IECoreMaya/CallbackId.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ClassParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ClassParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ClassParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ClassParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ClassVectorParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ClassVectorParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ClassVectorParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ClassVectorParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ColorSplineParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ColorSplineParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ColorSplineParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ColorSplineParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/CompoundNumericParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/CompoundNumericParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/CompoundNumericParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/CompoundNumericParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/CompoundParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/CompoundParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/CompoundParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/CompoundParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/Convert.cpp b/cortex-9.7.0/src/IECoreMaya/Convert.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/Convert.cpp rename to cortex-9.7.0/src/IECoreMaya/Convert.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ConverterHolder.cpp b/cortex-9.7.0/src/IECoreMaya/ConverterHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ConverterHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/ConverterHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/CurveCombiner.cpp b/cortex-9.7.0/src/IECoreMaya/CurveCombiner.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/CurveCombiner.cpp rename to cortex-9.7.0/src/IECoreMaya/CurveCombiner.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/DateTimeParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/DateTimeParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/DateTimeParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/DateTimeParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/DelightProceduralCacheCommand.cpp b/cortex-9.7.0/src/IECoreMaya/DelightProceduralCacheCommand.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/DelightProceduralCacheCommand.cpp rename to cortex-9.7.0/src/IECoreMaya/DelightProceduralCacheCommand.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/DisplayStyle.cpp b/cortex-9.7.0/src/IECoreMaya/DisplayStyle.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/DisplayStyle.cpp rename to cortex-9.7.0/src/IECoreMaya/DisplayStyle.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/DrawableHolder.cpp b/cortex-9.7.0/src/IECoreMaya/DrawableHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/DrawableHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/DrawableHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/DrawableHolderUI.cpp b/cortex-9.7.0/src/IECoreMaya/DrawableHolderUI.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/DrawableHolderUI.cpp rename to cortex-9.7.0/src/IECoreMaya/DrawableHolderUI.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FloatSplineParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/FloatSplineParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FloatSplineParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/FloatSplineParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaArrayDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaArrayDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaArrayDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaArrayDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaCameraConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaCameraConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaCameraConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaCurveConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaCurveConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaCurveConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaCurveConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaDagNodeConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaDagNodeConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaDagNodeConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaDagNodeConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaFluidConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaFluidConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaFluidConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaFluidConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaGroupConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaGroupConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaGroupConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaGroupConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaImageConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaImageConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaImageConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaImageConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaLocatorConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaLocatorConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaLocatorConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaLocatorConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaMatrixDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaMatrixDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaMatrixDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaMatrixDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaMeshConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaMeshConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaMeshConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaMeshConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaNumericDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaNumericDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaNumericDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaNumericDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaNumericPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaNumericPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaNumericPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaNumericPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaObjectConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaObjectConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaObjectDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaObjectDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaObjectDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaObjectDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaParticleConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaParticleConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaParticleConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaParticleConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaShapeConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaShapeConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaShapeConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaShapeConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaSkinClusterConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaSkinClusterConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaSkinClusterConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaSkinClusterConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaStringPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaStringPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaStringPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaStringPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaTransformConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaTransformConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaTransformConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaTransformConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/FromMayaUnitPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/FromMayaUnitPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/FromMayaUnitPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/FromMayaUnitPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/GeometryCombiner.cpp b/cortex-9.7.0/src/IECoreMaya/GeometryCombiner.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/GeometryCombiner.cpp rename to cortex-9.7.0/src/IECoreMaya/GeometryCombiner.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/IECoreMaya.cpp b/cortex-9.7.0/src/IECoreMaya/IECoreMaya.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/IECoreMaya.cpp rename to cortex-9.7.0/src/IECoreMaya/IECoreMaya.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ImageFile.cpp b/cortex-9.7.0/src/IECoreMaya/ImageFile.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ImageFile.cpp rename to cortex-9.7.0/src/IECoreMaya/ImageFile.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ImagePlaneHolder.cpp b/cortex-9.7.0/src/IECoreMaya/ImagePlaneHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ImagePlaneHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/ImagePlaneHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ImageViewportPostProcess.cpp b/cortex-9.7.0/src/IECoreMaya/ImageViewportPostProcess.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ImageViewportPostProcess.cpp rename to cortex-9.7.0/src/IECoreMaya/ImageViewportPostProcess.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/LineSegmentParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/LineSegmentParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/LineSegmentParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/LineSegmentParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/LiveScene.cpp b/cortex-9.7.0/src/IECoreMaya/LiveScene.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/LiveScene.cpp rename to cortex-9.7.0/src/IECoreMaya/LiveScene.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MDataHandleAccessor.cpp b/cortex-9.7.0/src/IECoreMaya/MDataHandleAccessor.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MDataHandleAccessor.cpp rename to cortex-9.7.0/src/IECoreMaya/MDataHandleAccessor.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MayaHeaderGenerator.cpp b/cortex-9.7.0/src/IECoreMaya/MayaHeaderGenerator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MayaHeaderGenerator.cpp rename to cortex-9.7.0/src/IECoreMaya/MayaHeaderGenerator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MayaPythonUtil.cpp b/cortex-9.7.0/src/IECoreMaya/MayaPythonUtil.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MayaPythonUtil.cpp rename to cortex-9.7.0/src/IECoreMaya/MayaPythonUtil.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MayaTime.cpp b/cortex-9.7.0/src/IECoreMaya/MayaTime.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MayaTime.cpp rename to cortex-9.7.0/src/IECoreMaya/MayaTime.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MeshParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/MeshParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MeshParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/MeshParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/MessageHandler.cpp b/cortex-9.7.0/src/IECoreMaya/MessageHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/MessageHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/MessageHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/NumericParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/NumericParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/NumericParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/NumericParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/NumericTraits.cpp b/cortex-9.7.0/src/IECoreMaya/NumericTraits.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/NumericTraits.cpp rename to cortex-9.7.0/src/IECoreMaya/NumericTraits.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ObjectData.cpp b/cortex-9.7.0/src/IECoreMaya/ObjectData.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ObjectData.cpp rename to cortex-9.7.0/src/IECoreMaya/ObjectData.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ObjectParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ObjectParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ObjectParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ObjectParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ObjectVectorParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ObjectVectorParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ObjectVectorParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ObjectVectorParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/OpHolder.cpp b/cortex-9.7.0/src/IECoreMaya/OpHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/OpHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/OpHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterManipContainer.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterManipContainer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterManipContainer.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterManipContainer.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolder.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolderInterface.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolderInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolderInterface.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolderInterface.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolderManipContext.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolderManipContext.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolderManipContext.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolderManipContext.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp b/cortex-9.7.0/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp rename to cortex-9.7.0/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/PlaybackFrameList.cpp b/cortex-9.7.0/src/IECoreMaya/PlaybackFrameList.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/PlaybackFrameList.cpp rename to cortex-9.7.0/src/IECoreMaya/PlaybackFrameList.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/PostLoadCallback.cpp b/cortex-9.7.0/src/IECoreMaya/PostLoadCallback.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/PostLoadCallback.cpp rename to cortex-9.7.0/src/IECoreMaya/PostLoadCallback.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ProceduralHolder.cpp b/cortex-9.7.0/src/IECoreMaya/ProceduralHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ProceduralHolder.cpp rename to cortex-9.7.0/src/IECoreMaya/ProceduralHolder.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp b/cortex-9.7.0/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp rename to cortex-9.7.0/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ProceduralHolderUI.cpp b/cortex-9.7.0/src/IECoreMaya/ProceduralHolderUI.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ProceduralHolderUI.cpp rename to cortex-9.7.0/src/IECoreMaya/ProceduralHolderUI.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/PythonCmd.cpp b/cortex-9.7.0/src/IECoreMaya/PythonCmd.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/PythonCmd.cpp rename to cortex-9.7.0/src/IECoreMaya/PythonCmd.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/SceneShape.cpp b/cortex-9.7.0/src/IECoreMaya/SceneShape.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/SceneShape.cpp rename to cortex-9.7.0/src/IECoreMaya/SceneShape.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/SceneShapeInterface.cpp b/cortex-9.7.0/src/IECoreMaya/SceneShapeInterface.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/SceneShapeInterface.cpp rename to cortex-9.7.0/src/IECoreMaya/SceneShapeInterface.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp b/cortex-9.7.0/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp rename to cortex-9.7.0/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/SceneShapeUI.cpp b/cortex-9.7.0/src/IECoreMaya/SceneShapeUI.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/SceneShapeUI.cpp rename to cortex-9.7.0/src/IECoreMaya/SceneShapeUI.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/StatusException.cpp b/cortex-9.7.0/src/IECoreMaya/StatusException.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/StatusException.cpp rename to cortex-9.7.0/src/IECoreMaya/StatusException.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/StringParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/StringParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/StringParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/StringParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/StringVectorParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/StringVectorParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/StringVectorParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/StringVectorParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/SystemExitCmd.cpp b/cortex-9.7.0/src/IECoreMaya/SystemExitCmd.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/SystemExitCmd.cpp rename to cortex-9.7.0/src/IECoreMaya/SystemExitCmd.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaArrayDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaArrayDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaArrayDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaArrayDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaCameraConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaCameraConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaCameraConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaCurveConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaCurveConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaCurveConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaCurveConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaGroupConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaGroupConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaGroupConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaGroupConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaImageConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaImageConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaImageConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaImageConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaLocatorConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaLocatorConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaLocatorConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaLocatorConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaMatrixDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaMatrixDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaMatrixDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaMatrixDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaMeshConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaMeshConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaMeshConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaMeshConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaNumericDataConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaNumericDataConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaNumericDataConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaNumericDataConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaObjectConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaObjectConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaObjectConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaObjectConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaParticleConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaParticleConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaParticleConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaParticleConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaPlugConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaPlugConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaPlugConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaPlugConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ToMayaSkinClusterConverter.cpp b/cortex-9.7.0/src/IECoreMaya/ToMayaSkinClusterConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ToMayaSkinClusterConverter.cpp rename to cortex-9.7.0/src/IECoreMaya/ToMayaSkinClusterConverter.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/TransformationMatrixManipulator.cpp b/cortex-9.7.0/src/IECoreMaya/TransformationMatrixManipulator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/TransformationMatrixManipulator.cpp rename to cortex-9.7.0/src/IECoreMaya/TransformationMatrixManipulator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/TransformationMatrixParameterHandler.cpp b/cortex-9.7.0/src/IECoreMaya/TransformationMatrixParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/TransformationMatrixParameterHandler.cpp rename to cortex-9.7.0/src/IECoreMaya/TransformationMatrixParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/TransientParameterisedHolderNode.cpp b/cortex-9.7.0/src/IECoreMaya/TransientParameterisedHolderNode.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/TransientParameterisedHolderNode.cpp rename to cortex-9.7.0/src/IECoreMaya/TransientParameterisedHolderNode.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/V3Manipulator.cpp b/cortex-9.7.0/src/IECoreMaya/V3Manipulator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/V3Manipulator.cpp rename to cortex-9.7.0/src/IECoreMaya/V3Manipulator.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ViewportPostProcess.cpp b/cortex-9.7.0/src/IECoreMaya/ViewportPostProcess.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ViewportPostProcess.cpp rename to cortex-9.7.0/src/IECoreMaya/ViewportPostProcess.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ViewportPostProcessCallback.cpp b/cortex-9.7.0/src/IECoreMaya/ViewportPostProcessCallback.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ViewportPostProcessCallback.cpp rename to cortex-9.7.0/src/IECoreMaya/ViewportPostProcessCallback.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp b/cortex-9.7.0/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/CallbackIdBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/CallbackIdBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/CallbackIdBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/CallbackIdBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/IECoreMaya.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/IECoreMaya.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/IECoreMaya.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/IECoreMaya.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/LiveSceneBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/LiveSceneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/LiveSceneBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/LiveSceneBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MDagPathFromPython.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MDagPathFromPython.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MDagPathFromPython.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MDagPathFromPython.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MObjectFromPython.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MObjectFromPython.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MObjectFromPython.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MObjectFromPython.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MPlugFromPython.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MPlugFromPython.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MPlugFromPython.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MPlugFromPython.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MStringFromPython.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MStringFromPython.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MStringFromPython.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MStringFromPython.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/MessageHandlerBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/MessageHandlerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/MessageHandlerBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/MessageHandlerBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/StandaloneBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/StandaloneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/StandaloneBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/StandaloneBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/TypeIdBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/TypeIdBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/TypeIdBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/TypeIdBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp b/cortex-9.7.0/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp rename to cortex-9.7.0/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/plugin/Loader.cpp b/cortex-9.7.0/src/IECoreMaya/plugin/Loader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/plugin/Loader.cpp rename to cortex-9.7.0/src/IECoreMaya/plugin/Loader.cpp diff --git a/cortex-9.6.0/src/IECoreMaya/plugin/Plugin.cpp b/cortex-9.7.0/src/IECoreMaya/plugin/Plugin.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreMaya/plugin/Plugin.cpp rename to cortex-9.7.0/src/IECoreMaya/plugin/Plugin.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/BoolParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/BoolParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/BoolParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/BoolParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/Box3ParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/Box3ParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/Box3ParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/Box3ParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ClassParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/ClassParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ClassParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/ClassParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ClassVectorParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/ClassVectorParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ClassVectorParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/ClassVectorParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/Color3fParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/Color3fParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/Color3fParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/Color3fParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/CompoundParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/CompoundParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/CompoundParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/CompoundParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/Convert.cpp b/cortex-9.7.0/src/IECoreNuke/Convert.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/Convert.cpp rename to cortex-9.7.0/src/IECoreNuke/Convert.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/DeepImageReader.cpp b/cortex-9.7.0/src/IECoreNuke/DeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/DeepImageReader.cpp rename to cortex-9.7.0/src/IECoreNuke/DeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/DisplayIop.cpp b/cortex-9.7.0/src/IECoreNuke/DisplayIop.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/DisplayIop.cpp rename to cortex-9.7.0/src/IECoreNuke/DisplayIop.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/DrawableHolder.cpp b/cortex-9.7.0/src/IECoreNuke/DrawableHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/DrawableHolder.cpp rename to cortex-9.7.0/src/IECoreNuke/DrawableHolder.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/FloatParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/FloatParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/FloatParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/FloatParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/FromNukeCameraConverter.cpp b/cortex-9.7.0/src/IECoreNuke/FromNukeCameraConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/FromNukeCameraConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/FromNukeCameraConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/FromNukeConverter.cpp b/cortex-9.7.0/src/IECoreNuke/FromNukeConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/FromNukeConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/FromNukeConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/FromNukePointsConverter.cpp b/cortex-9.7.0/src/IECoreNuke/FromNukePointsConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/FromNukePointsConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/FromNukePointsConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/FromNukeTileConverter.cpp b/cortex-9.7.0/src/IECoreNuke/FromNukeTileConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/FromNukeTileConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/FromNukeTileConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/IntParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/IntParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/IntParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/IntParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/LensDistort.cpp b/cortex-9.7.0/src/IECoreNuke/LensDistort.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/LensDistort.cpp rename to cortex-9.7.0/src/IECoreNuke/LensDistort.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/LineSegment3ParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/LineSegment3ParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/LineSegment3ParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/LineSegment3ParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/MeshFromNuke.cpp b/cortex-9.7.0/src/IECoreNuke/MeshFromNuke.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/MeshFromNuke.cpp rename to cortex-9.7.0/src/IECoreNuke/MeshFromNuke.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/MeshToNukeGeometryConverter.cpp b/cortex-9.7.0/src/IECoreNuke/MeshToNukeGeometryConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/MeshToNukeGeometryConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/MeshToNukeGeometryConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ObjectHolder.cpp b/cortex-9.7.0/src/IECoreNuke/ObjectHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ObjectHolder.cpp rename to cortex-9.7.0/src/IECoreNuke/ObjectHolder.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ObjectKnob.cpp b/cortex-9.7.0/src/IECoreNuke/ObjectKnob.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ObjectKnob.cpp rename to cortex-9.7.0/src/IECoreNuke/ObjectKnob.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ObjectVectorParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/ObjectVectorParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ObjectVectorParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/ObjectVectorParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/OpHolder.cpp b/cortex-9.7.0/src/IECoreNuke/OpHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/OpHolder.cpp rename to cortex-9.7.0/src/IECoreNuke/OpHolder.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/ParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/ParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ParameterisedHolder.cpp b/cortex-9.7.0/src/IECoreNuke/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ParameterisedHolder.cpp rename to cortex-9.7.0/src/IECoreNuke/ParameterisedHolder.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/PathParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/PathParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/PathParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/PathParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/PointToNukeGeometryConverter.cpp b/cortex-9.7.0/src/IECoreNuke/PointToNukeGeometryConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/PointToNukeGeometryConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/PointToNukeGeometryConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/PresetsOnlyParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/PresetsOnlyParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/PresetsOnlyParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/PresetsOnlyParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ProceduralHolder.cpp b/cortex-9.7.0/src/IECoreNuke/ProceduralHolder.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ProceduralHolder.cpp rename to cortex-9.7.0/src/IECoreNuke/ProceduralHolder.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/Python.cpp b/cortex-9.7.0/src/IECoreNuke/Python.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/Python.cpp rename to cortex-9.7.0/src/IECoreNuke/Python.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/SceneCacheReader.cpp b/cortex-9.7.0/src/IECoreNuke/SceneCacheReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/SceneCacheReader.cpp rename to cortex-9.7.0/src/IECoreNuke/SceneCacheReader.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/StringParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/StringParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/StringParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/StringParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ToNukeConverter.cpp b/cortex-9.7.0/src/IECoreNuke/ToNukeConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ToNukeConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/ToNukeConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/ToNukeGeometryConverter.cpp b/cortex-9.7.0/src/IECoreNuke/ToNukeGeometryConverter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/ToNukeGeometryConverter.cpp rename to cortex-9.7.0/src/IECoreNuke/ToNukeGeometryConverter.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/VecParameterHandler.cpp b/cortex-9.7.0/src/IECoreNuke/VecParameterHandler.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/VecParameterHandler.cpp rename to cortex-9.7.0/src/IECoreNuke/VecParameterHandler.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/Warp.cpp b/cortex-9.7.0/src/IECoreNuke/Warp.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/Warp.cpp rename to cortex-9.7.0/src/IECoreNuke/Warp.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/bindings/FnOpHolderBinding.cpp b/cortex-9.7.0/src/IECoreNuke/bindings/FnOpHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/bindings/FnOpHolderBinding.cpp rename to cortex-9.7.0/src/IECoreNuke/bindings/FnOpHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.7.0/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.7.0/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/bindings/IECoreNuke.cpp b/cortex-9.7.0/src/IECoreNuke/bindings/IECoreNuke.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/bindings/IECoreNuke.cpp rename to cortex-9.7.0/src/IECoreNuke/bindings/IECoreNuke.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/bindings/ObjectKnobBinding.cpp b/cortex-9.7.0/src/IECoreNuke/bindings/ObjectKnobBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/bindings/ObjectKnobBinding.cpp rename to cortex-9.7.0/src/IECoreNuke/bindings/ObjectKnobBinding.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/plugin/Plugin.cpp b/cortex-9.7.0/src/IECoreNuke/plugin/Plugin.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/plugin/Plugin.cpp rename to cortex-9.7.0/src/IECoreNuke/plugin/Plugin.cpp diff --git a/cortex-9.6.0/src/IECoreNuke/plugin/ieProcedural.tcl b/cortex-9.7.0/src/IECoreNuke/plugin/ieProcedural.tcl similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/plugin/ieProcedural.tcl rename to cortex-9.7.0/src/IECoreNuke/plugin/ieProcedural.tcl diff --git a/cortex-9.6.0/src/IECoreNuke/plugin/menu.py b/cortex-9.7.0/src/IECoreNuke/plugin/menu.py similarity index 100% rename from cortex-9.6.0/src/IECoreNuke/plugin/menu.py rename to cortex-9.7.0/src/IECoreNuke/plugin/menu.py diff --git a/cortex-9.6.0/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.7.0/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/AlexaLogcToLinearOpBinding.cpp b/cortex-9.7.0/src/IECorePython/AlexaLogcToLinearOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/AlexaLogcToLinearOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/AlexaLogcToLinearOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/AngleConversionBinding.cpp b/cortex-9.7.0/src/IECorePython/AngleConversionBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/AngleConversionBinding.cpp rename to cortex-9.7.0/src/IECorePython/AngleConversionBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/AttributeStateBinding.cpp b/cortex-9.7.0/src/IECorePython/AttributeStateBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/AttributeStateBinding.cpp rename to cortex-9.7.0/src/IECorePython/AttributeStateBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/BezierAlgoBinding.cpp b/cortex-9.7.0/src/IECorePython/BezierAlgoBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/BezierAlgoBinding.cpp rename to cortex-9.7.0/src/IECorePython/BezierAlgoBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/BinaryFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/BinaryFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/BinaryFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/BinaryFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/BlindDataHolderBinding.cpp b/cortex-9.7.0/src/IECorePython/BlindDataHolderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/BlindDataHolderBinding.cpp rename to cortex-9.7.0/src/IECorePython/BlindDataHolderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/BoundedKDTreeBinding.cpp b/cortex-9.7.0/src/IECorePython/BoundedKDTreeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/BoundedKDTreeBinding.cpp rename to cortex-9.7.0/src/IECorePython/BoundedKDTreeBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CINImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/CINImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CINImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/CINImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CINImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/CINImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CINImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/CINImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CachedReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/CachedReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CachedReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/CachedReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CamelCaseBinding.cpp b/cortex-9.7.0/src/IECorePython/CamelCaseBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CamelCaseBinding.cpp rename to cortex-9.7.0/src/IECorePython/CamelCaseBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CameraBinding.cpp b/cortex-9.7.0/src/IECorePython/CameraBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CameraBinding.cpp rename to cortex-9.7.0/src/IECorePython/CameraBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CameraControllerBinding.cpp b/cortex-9.7.0/src/IECorePython/CameraControllerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CameraControllerBinding.cpp rename to cortex-9.7.0/src/IECorePython/CameraControllerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CapturingRendererBinding.cpp b/cortex-9.7.0/src/IECorePython/CapturingRendererBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CapturingRendererBinding.cpp rename to cortex-9.7.0/src/IECorePython/CapturingRendererBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ChannelOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ChannelOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ChannelOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ChannelOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CineonToLinearOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CineonToLinearOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CineonToLinearOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CineonToLinearOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ClampOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ClampOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ClampOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ClampOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ClientDisplayDriverBinding.cpp b/cortex-9.7.0/src/IECorePython/ClientDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ClientDisplayDriverBinding.cpp rename to cortex-9.7.0/src/IECorePython/ClientDisplayDriverBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ClippingPlaneBinding.cpp b/cortex-9.7.0/src/IECorePython/ClippingPlaneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ClippingPlaneBinding.cpp rename to cortex-9.7.0/src/IECorePython/ClippingPlaneBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ColorSpaceTransformOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ColorSpaceTransformOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ColorSpaceTransformOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ColorSpaceTransformOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ColorTransformOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ColorTransformOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ColorTransformOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CompoundDataBinding.cpp b/cortex-9.7.0/src/IECorePython/CompoundDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CompoundDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/CompoundDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CompoundFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/CompoundFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CompoundFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/CompoundFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CompoundObjectBinding.cpp b/cortex-9.7.0/src/IECorePython/CompoundObjectBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CompoundObjectBinding.cpp rename to cortex-9.7.0/src/IECorePython/CompoundObjectBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CompoundParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/CompoundParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CompoundParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/CompoundParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ConverterBinding.cpp b/cortex-9.7.0/src/IECorePython/ConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ConverterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CoordinateSystemBinding.cpp b/cortex-9.7.0/src/IECorePython/CoordinateSystemBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CoordinateSystemBinding.cpp rename to cortex-9.7.0/src/IECorePython/CoordinateSystemBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CubeColorLookupBinding.cpp b/cortex-9.7.0/src/IECorePython/CubeColorLookupBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CubeColorLookupBinding.cpp rename to cortex-9.7.0/src/IECorePython/CubeColorLookupBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CubeColorLookupDataBinding.cpp b/cortex-9.7.0/src/IECorePython/CubeColorLookupDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CubeColorLookupDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/CubeColorLookupDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CubeColorLookupParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/CubeColorLookupParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CubeColorLookupParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/CubeColorLookupParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CubeColorTransformOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CubeColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CubeColorTransformOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CubeColorTransformOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CubicBasisBinding.cpp b/cortex-9.7.0/src/IECorePython/CubicBasisBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CubicBasisBinding.cpp rename to cortex-9.7.0/src/IECorePython/CubicBasisBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurveExtrudeOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CurveExtrudeOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurveExtrudeOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurveExtrudeOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurveLineariserBinding.cpp b/cortex-9.7.0/src/IECorePython/CurveLineariserBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurveLineariserBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurveLineariserBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurveTangentsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CurveTangentsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurveTangentsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurveTangentsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurveTracerBinding.cpp b/cortex-9.7.0/src/IECorePython/CurveTracerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurveTracerBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurveTracerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurvesMergeOpBinding.cpp b/cortex-9.7.0/src/IECorePython/CurvesMergeOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurvesMergeOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurvesMergeOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurvesPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/CurvesPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurvesPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurvesPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DPXImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/DPXImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DPXImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/DPXImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DPXImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/DPXImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DPXImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/DPXImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataAlgoBinding.cpp b/cortex-9.7.0/src/IECorePython/DataAlgoBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataAlgoBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataAlgoBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataBinding.cpp b/cortex-9.7.0/src/IECorePython/DataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataCastOpBinding.cpp b/cortex-9.7.0/src/IECorePython/DataCastOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataCastOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataCastOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataConvertOpBinding.cpp b/cortex-9.7.0/src/IECorePython/DataConvertOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataConvertOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataConvertOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataInterleaveOpBinding.cpp b/cortex-9.7.0/src/IECorePython/DataInterleaveOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataInterleaveOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataInterleaveOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DataPromoteOpBinding.cpp b/cortex-9.7.0/src/IECorePython/DataPromoteOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DataPromoteOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/DataPromoteOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DateTimeDataBinding.cpp b/cortex-9.7.0/src/IECorePython/DateTimeDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DateTimeDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/DateTimeDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DateTimeParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/DateTimeParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DateTimeParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/DateTimeParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp b/cortex-9.7.0/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DeepImageConverterBinding.cpp b/cortex-9.7.0/src/IECorePython/DeepImageConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DeepImageConverterBinding.cpp rename to cortex-9.7.0/src/IECorePython/DeepImageConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DeepImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/DeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DeepImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/DeepImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DeepImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/DeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DeepImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/DeepImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DeepPixelBinding.cpp b/cortex-9.7.0/src/IECorePython/DeepPixelBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DeepPixelBinding.cpp rename to cortex-9.7.0/src/IECorePython/DeepPixelBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DirNameParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/DirNameParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DirNameParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/DirNameParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DiskPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/DiskPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DiskPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/DiskPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DisplayBinding.cpp b/cortex-9.7.0/src/IECorePython/DisplayBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DisplayBinding.cpp rename to cortex-9.7.0/src/IECorePython/DisplayBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DisplayDriverBinding.cpp b/cortex-9.7.0/src/IECorePython/DisplayDriverBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DisplayDriverBinding.cpp rename to cortex-9.7.0/src/IECorePython/DisplayDriverBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/DisplayDriverServerBinding.cpp b/cortex-9.7.0/src/IECorePython/DisplayDriverServerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/DisplayDriverServerBinding.cpp rename to cortex-9.7.0/src/IECorePython/DisplayDriverServerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EXRDeepImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/EXRDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EXRDeepImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/EXRDeepImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EXRDeepImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/EXRDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EXRDeepImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/EXRDeepImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EXRImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/EXRImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EXRImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/EXRImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EXRImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/EXRImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EXRImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/EXRImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EmptyFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/EmptyFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EmptyFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/EmptyFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/EnvMapSamplerBinding.cpp b/cortex-9.7.0/src/IECorePython/EnvMapSamplerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/EnvMapSamplerBinding.cpp rename to cortex-9.7.0/src/IECorePython/EnvMapSamplerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ExceptionBinding.cpp b/cortex-9.7.0/src/IECorePython/ExceptionBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ExceptionBinding.cpp rename to cortex-9.7.0/src/IECorePython/ExceptionBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ExclusionFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/ExclusionFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ExclusionFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/ExclusionFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ExternalProceduralBinding.cpp b/cortex-9.7.0/src/IECorePython/ExternalProceduralBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ExternalProceduralBinding.cpp rename to cortex-9.7.0/src/IECorePython/ExternalProceduralBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FaceAreaOpBinding.cpp b/cortex-9.7.0/src/IECorePython/FaceAreaOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FaceAreaOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/FaceAreaOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FaceVaryingPromotionOpBinding.cpp b/cortex-9.7.0/src/IECorePython/FaceVaryingPromotionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FaceVaryingPromotionOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/FaceVaryingPromotionOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FileNameParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/FileNameParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FileNameParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/FileNameParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FileSequenceBinding.cpp b/cortex-9.7.0/src/IECorePython/FileSequenceBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FileSequenceBinding.cpp rename to cortex-9.7.0/src/IECorePython/FileSequenceBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FileSequenceFunctionsBinding.cpp b/cortex-9.7.0/src/IECorePython/FileSequenceFunctionsBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FileSequenceFunctionsBinding.cpp rename to cortex-9.7.0/src/IECorePython/FileSequenceFunctionsBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FileSequenceParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/FileSequenceParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FileSequenceParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/FileSequenceParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FileSequenceVectorParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/FileSequenceVectorParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FileSequenceVectorParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/FileSequenceVectorParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FontBinding.cpp b/cortex-9.7.0/src/IECorePython/FontBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FontBinding.cpp rename to cortex-9.7.0/src/IECorePython/FontBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/FrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/FrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FrameListParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/FrameListParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FrameListParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/FrameListParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FrameRangeBinding.cpp b/cortex-9.7.0/src/IECorePython/FrameRangeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FrameRangeBinding.cpp rename to cortex-9.7.0/src/IECorePython/FrameRangeBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/FromCoreConverterBinding.cpp b/cortex-9.7.0/src/IECorePython/FromCoreConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/FromCoreConverterBinding.cpp rename to cortex-9.7.0/src/IECorePython/FromCoreConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/GeometricTypedDataBinding.cpp b/cortex-9.7.0/src/IECorePython/GeometricTypedDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/GeometricTypedDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/GeometricTypedDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/GradeBinding.cpp b/cortex-9.7.0/src/IECorePython/GradeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/GradeBinding.cpp rename to cortex-9.7.0/src/IECorePython/GradeBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/GroupBinding.cpp b/cortex-9.7.0/src/IECorePython/GroupBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/GroupBinding.cpp rename to cortex-9.7.0/src/IECorePython/GroupBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/HalfBinding.cpp b/cortex-9.7.0/src/IECorePython/HalfBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/HalfBinding.cpp rename to cortex-9.7.0/src/IECorePython/HalfBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/HdrMergeOpBinding.cpp b/cortex-9.7.0/src/IECorePython/HdrMergeOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/HdrMergeOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/HdrMergeOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/HeaderGeneratorBinding.cpp b/cortex-9.7.0/src/IECorePython/HeaderGeneratorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/HeaderGeneratorBinding.cpp rename to cortex-9.7.0/src/IECorePython/HeaderGeneratorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/HenyeyGreensteinBinding.cpp b/cortex-9.7.0/src/IECorePython/HenyeyGreensteinBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/HenyeyGreensteinBinding.cpp rename to cortex-9.7.0/src/IECorePython/HenyeyGreensteinBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/HexConversionBinding.cpp b/cortex-9.7.0/src/IECorePython/HexConversionBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/HexConversionBinding.cpp rename to cortex-9.7.0/src/IECorePython/HexConversionBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageCompositeOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageCompositeOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageCompositeOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageCompositeOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageCropOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageCropOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageCropOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageCropOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageDiffOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageDiffOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageDiffOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageDiffOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageDisplayDriverBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageDisplayDriverBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageDisplayDriverBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImagePremultiplyOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ImagePremultiplyOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImagePremultiplyOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImagePremultiplyOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImagePrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/ImagePrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImagePrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImagePrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageThinnerBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageThinnerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageThinnerBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageThinnerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageUnpremultiplyOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageUnpremultiplyOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageUnpremultiplyOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageUnpremultiplyOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/ImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathBoxBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathBoxBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathBoxBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathBoxBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathBoxVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathBoxVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathBoxVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathBoxVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathColorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathColorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathColorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathColorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathColorVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathColorVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathColorVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathColorVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathEulerBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathEulerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathEulerBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathEulerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathMatrixBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathMatrixBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathMatrixBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathMatrixBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathMatrixVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathMatrixVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathMatrixVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathMatrixVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathPlaneBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathPlaneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathPlaneBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathPlaneBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathQuatBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathQuatBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathQuatBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathQuatBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathQuatVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathQuatVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathQuatVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathQuatVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathRandomBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathRandomBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathRandomBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathRandomBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathRootsBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathRootsBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathRootsBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathRootsBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathVecBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathVecBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathVecBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathVecBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImathVecVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ImathVecVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImathVecVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImathVecVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImfBinding.cpp b/cortex-9.7.0/src/IECorePython/ImfBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImfBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImfBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ImfTimeCodeBinding.cpp b/cortex-9.7.0/src/IECorePython/ImfTimeCodeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ImfTimeCodeBinding.cpp rename to cortex-9.7.0/src/IECorePython/ImfTimeCodeBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/IndexedIOBinding.cpp b/cortex-9.7.0/src/IECorePython/IndexedIOBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/IndexedIOBinding.cpp rename to cortex-9.7.0/src/IECorePython/IndexedIOBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/InternedStringBinding.cpp b/cortex-9.7.0/src/IECorePython/InternedStringBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/InternedStringBinding.cpp rename to cortex-9.7.0/src/IECorePython/InternedStringBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp b/cortex-9.7.0/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp rename to cortex-9.7.0/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/JPEGImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/JPEGImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/JPEGImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/JPEGImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/JPEGImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/JPEGImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/JPEGImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/JPEGImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/KDTreeBinding.cpp b/cortex-9.7.0/src/IECorePython/KDTreeBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/KDTreeBinding.cpp rename to cortex-9.7.0/src/IECorePython/KDTreeBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LRUCacheBinding.cpp b/cortex-9.7.0/src/IECorePython/LRUCacheBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LRUCacheBinding.cpp rename to cortex-9.7.0/src/IECorePython/LRUCacheBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LensDistortOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LensDistortOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LensDistortOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LensDistortOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LensModelBinding.cpp b/cortex-9.7.0/src/IECorePython/LensModelBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LensModelBinding.cpp rename to cortex-9.7.0/src/IECorePython/LensModelBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LevenbergMarquardtBinding.cpp b/cortex-9.7.0/src/IECorePython/LevenbergMarquardtBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LevenbergMarquardtBinding.cpp rename to cortex-9.7.0/src/IECorePython/LevenbergMarquardtBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LightBinding.cpp b/cortex-9.7.0/src/IECorePython/LightBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LightBinding.cpp rename to cortex-9.7.0/src/IECorePython/LightBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LineSegmentBinding.cpp b/cortex-9.7.0/src/IECorePython/LineSegmentBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LineSegmentBinding.cpp rename to cortex-9.7.0/src/IECorePython/LineSegmentBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinearToAlexaLogcOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LinearToAlexaLogcOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinearToAlexaLogcOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinearToAlexaLogcOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinearToCineonOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LinearToCineonOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinearToCineonOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinearToCineonOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinearToPanalogOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LinearToPanalogOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinearToPanalogOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinearToPanalogOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinearToRec709OpBinding.cpp b/cortex-9.7.0/src/IECorePython/LinearToRec709OpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinearToRec709OpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinearToRec709OpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinearToSRGBOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LinearToSRGBOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinearToSRGBOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinearToSRGBOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LinkedSceneBinding.cpp b/cortex-9.7.0/src/IECorePython/LinkedSceneBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LinkedSceneBinding.cpp rename to cortex-9.7.0/src/IECorePython/LinkedSceneBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LookupBinding.cpp b/cortex-9.7.0/src/IECorePython/LookupBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LookupBinding.cpp rename to cortex-9.7.0/src/IECorePython/LookupBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/LuminanceOpBinding.cpp b/cortex-9.7.0/src/IECorePython/LuminanceOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/LuminanceOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/LuminanceOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MPlayDisplayDriverBinding.cpp b/cortex-9.7.0/src/IECorePython/MPlayDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MPlayDisplayDriverBinding.cpp rename to cortex-9.7.0/src/IECorePython/MPlayDisplayDriverBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MathBinding.cpp b/cortex-9.7.0/src/IECorePython/MathBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MathBinding.cpp rename to cortex-9.7.0/src/IECorePython/MathBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MatrixMotionTransformBinding.cpp b/cortex-9.7.0/src/IECorePython/MatrixMotionTransformBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MatrixMotionTransformBinding.cpp rename to cortex-9.7.0/src/IECorePython/MatrixMotionTransformBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MatrixMultiplyOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MatrixMultiplyOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MatrixMultiplyOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MatrixMultiplyOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MatrixTransformBinding.cpp b/cortex-9.7.0/src/IECorePython/MatrixTransformBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MatrixTransformBinding.cpp rename to cortex-9.7.0/src/IECorePython/MatrixTransformBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MedianCutSamplerBinding.cpp b/cortex-9.7.0/src/IECorePython/MedianCutSamplerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MedianCutSamplerBinding.cpp rename to cortex-9.7.0/src/IECorePython/MedianCutSamplerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshDistortionsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshDistortionsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshDistortionsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshDistortionsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshFaceFilterOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshFaceFilterOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshFaceFilterOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshFaceFilterOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshMergeOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshMergeOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshMergeOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshMergeOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshNormalsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshNormalsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshNormalsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshNormalsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshPrimitiveBuilderBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshPrimitiveBuilderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshPrimitiveBuilderBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshPrimitiveBuilderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshTangentsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshTangentsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshTangentsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshTangentsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MeshVertexReorderOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MeshVertexReorderOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MeshVertexReorderOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MeshVertexReorderOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MessageHandlerBinding.cpp b/cortex-9.7.0/src/IECorePython/MessageHandlerBinding.cpp similarity index 86% rename from cortex-9.6.0/src/IECorePython/MessageHandlerBinding.cpp rename to cortex-9.7.0/src/IECorePython/MessageHandlerBinding.cpp index 53fb092fe8..4bd4663f1a 100644 --- a/cortex-9.6.0/src/IECorePython/MessageHandlerBinding.cpp +++ b/cortex-9.7.0/src/IECorePython/MessageHandlerBinding.cpp @@ -42,50 +42,62 @@ #include "IECore/LevelFilteredMessageHandler.h" #include "IECorePython/MessageHandlerBinding.h" #include "IECorePython/RefCountedBinding.h" -#include "IECorePython/Wrapper.h" #include "IECorePython/ScopedGILLock.h" using namespace boost::python; using namespace IECore; +using namespace IECorePython; -namespace IECorePython +namespace { -class MessageHandlerWrap : public MessageHandler, public Wrapper +class MessageHandlerWrapper : public RefCountedWrapper { public : - MessageHandlerWrap( PyObject *self ) : Wrapper( self, this ) {} + MessageHandlerWrapper( PyObject *self ) : RefCountedWrapper( self ) + { + } virtual void handle( MessageHandler::Level level, const std::string &context, const std::string &message ) { ScopedGILLock gilLock; - this->get_override( "handle" )( level, context, message ); + try + { + this->methodOverride( "handle" )( level, context, message ); + } + catch( const error_already_set &e ) + { + /// \todo Move GafferBindings::ExceptionAlgo to Cortex and use it here? + PyErr_Print(); + } } }; -static void addHandler( CompoundMessageHandler &h, MessageHandlerPtr hh ) +void addHandler( CompoundMessageHandler &h, MessageHandlerPtr hh ) { h.handlers.insert( hh ); } -static void removeHandler( CompoundMessageHandler &h, MessageHandlerPtr hh ) +void removeHandler( CompoundMessageHandler &h, MessageHandlerPtr hh ) { h.handlers.erase( hh ); } -static LevelFilteredMessageHandlerPtr levelFilteredMessageHandlerConstructor(MessageHandlerPtr handle, MessageHandler::Level level) +LevelFilteredMessageHandlerPtr levelFilteredMessageHandlerConstructor(MessageHandlerPtr handle, MessageHandler::Level level) { return new LevelFilteredMessageHandler( handle, level ); } -void bindMessageHandler() +} // namespace + +void IECorePython::bindMessageHandler() { def( "msg", (void (*)( MessageHandler::Level, const std::string &, const std::string &))&msg ); - object mh = RefCountedClass( "MessageHandler" ) + object mh = RefCountedClass( "MessageHandler" ) .def( init<>() ) .def( "handle", pure_virtual( &MessageHandler::handle ) ) .def( "setDefaultHandler", &MessageHandler::setDefaultHandler ) @@ -143,5 +155,3 @@ void bindMessageHandler() ; } - -} diff --git a/cortex-9.6.0/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ModifyOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ModifyOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ModifyOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ModifyOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MotionPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/MotionPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MotionPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/MotionPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/MurmurHashBinding.cpp b/cortex-9.7.0/src/IECorePython/MurmurHashBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/MurmurHashBinding.cpp rename to cortex-9.7.0/src/IECorePython/MurmurHashBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/NParticleReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/NParticleReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/NParticleReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/NParticleReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/NURBSPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/NURBSPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/NURBSPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/NURBSPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/NullObjectBinding.cpp b/cortex-9.7.0/src/IECorePython/NullObjectBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/NullObjectBinding.cpp rename to cortex-9.7.0/src/IECorePython/NullObjectBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/NumericParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/NumericParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/NumericParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/NumericParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/OBJReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/OBJReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/OBJReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/OBJReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectInterpolatorBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectInterpolatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectInterpolatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectInterpolatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectPoolBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectPoolBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectPoolBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectPoolBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectVectorBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectVectorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectVectorBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectVectorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ObjectWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/ObjectWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ObjectWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ObjectWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/OpBinding.cpp b/cortex-9.7.0/src/IECorePython/OpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/OpBinding.cpp rename to cortex-9.7.0/src/IECorePython/OpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/OptionsBinding.cpp b/cortex-9.7.0/src/IECorePython/OptionsBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/OptionsBinding.cpp rename to cortex-9.7.0/src/IECorePython/OptionsBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/OversamplesCalculatorBinding.cpp b/cortex-9.7.0/src/IECorePython/OversamplesCalculatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/OversamplesCalculatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/OversamplesCalculatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PDCParticleReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/PDCParticleReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PDCParticleReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/PDCParticleReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PDCParticleWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/PDCParticleWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PDCParticleWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/PDCParticleWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PNGImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/PNGImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PNGImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/PNGImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PanalogToLinearOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PanalogToLinearOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PanalogToLinearOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PanalogToLinearOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/ParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ParameterisedBinding.cpp b/cortex-9.7.0/src/IECorePython/ParameterisedBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ParameterisedBinding.cpp rename to cortex-9.7.0/src/IECorePython/ParameterisedBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ParameterisedProceduralBinding.cpp b/cortex-9.7.0/src/IECorePython/ParameterisedProceduralBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ParameterisedProceduralBinding.cpp rename to cortex-9.7.0/src/IECorePython/ParameterisedProceduralBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ParticleReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/ParticleReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ParticleReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/ParticleReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ParticleWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/ParticleWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ParticleWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ParticleWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PatchMeshPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/PatchMeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PatchMeshPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/PatchMeshPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PathParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/PathParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PathParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/PathParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PathVectorParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/PathVectorParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PathVectorParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/PathVectorParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PerlinNoiseBinding.cpp b/cortex-9.7.0/src/IECorePython/PerlinNoiseBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PerlinNoiseBinding.cpp rename to cortex-9.7.0/src/IECorePython/PerlinNoiseBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointBoundsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointBoundsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointBoundsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointBoundsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointDensitiesOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointDensitiesOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointDensitiesOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointDensitiesOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointDistributionBinding.cpp b/cortex-9.7.0/src/IECorePython/PointDistributionBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointDistributionBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointDistributionBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointDistributionOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointDistributionOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointDistributionOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointNormalsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointNormalsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointNormalsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointNormalsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointRepulsionOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointRepulsionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointRepulsionOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointRepulsionOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointSmoothSkinningOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointSmoothSkinningOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointSmoothSkinningOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointSmoothSkinningOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointVelocityDisplaceOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointVelocityDisplaceOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointVelocityDisplaceOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointVelocityDisplaceOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointsMotionOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PointsMotionOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointsMotionOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointsMotionOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointsPrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/PointsPrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointsPrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointsPrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PolygonAlgoBinding.cpp b/cortex-9.7.0/src/IECorePython/PolygonAlgoBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PolygonAlgoBinding.cpp rename to cortex-9.7.0/src/IECorePython/PolygonAlgoBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PreWorldRenderableBinding.cpp b/cortex-9.7.0/src/IECorePython/PreWorldRenderableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PreWorldRenderableBinding.cpp rename to cortex-9.7.0/src/IECorePython/PreWorldRenderableBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/PrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/PrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/PrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/PrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PrimitiveOpBinding.cpp b/cortex-9.7.0/src/IECorePython/PrimitiveOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PrimitiveOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/PrimitiveOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/PrimitiveVariableBinding.cpp b/cortex-9.7.0/src/IECorePython/PrimitiveVariableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/PrimitiveVariableBinding.cpp rename to cortex-9.7.0/src/IECorePython/PrimitiveVariableBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RadixSortBinding.cpp b/cortex-9.7.0/src/IECorePython/RadixSortBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RadixSortBinding.cpp rename to cortex-9.7.0/src/IECorePython/RadixSortBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RandomRotationOpBinding.cpp b/cortex-9.7.0/src/IECorePython/RandomRotationOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RandomRotationOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/RandomRotationOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/ReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/ReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/Rec709ToLinearOpBinding.cpp b/cortex-9.7.0/src/IECorePython/Rec709ToLinearOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/Rec709ToLinearOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/Rec709ToLinearOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RefCountedBinding.cpp b/cortex-9.7.0/src/IECorePython/RefCountedBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RefCountedBinding.cpp rename to cortex-9.7.0/src/IECorePython/RefCountedBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.7.0/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RenderableBinding.cpp b/cortex-9.7.0/src/IECorePython/RenderableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RenderableBinding.cpp rename to cortex-9.7.0/src/IECorePython/RenderableBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RendererBinding.cpp b/cortex-9.7.0/src/IECorePython/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RendererBinding.cpp rename to cortex-9.7.0/src/IECorePython/RendererBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.7.0/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ReorderedFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/ReorderedFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ReorderedFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/ReorderedFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ReversedFrameListBinding.cpp b/cortex-9.7.0/src/IECorePython/ReversedFrameListBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ReversedFrameListBinding.cpp rename to cortex-9.7.0/src/IECorePython/ReversedFrameListBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/RunTimeTypedBinding.cpp b/cortex-9.7.0/src/IECorePython/RunTimeTypedBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/RunTimeTypedBinding.cpp rename to cortex-9.7.0/src/IECorePython/RunTimeTypedBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SGIImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/SGIImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SGIImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/SGIImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SRGBToLinearOpBinding.cpp b/cortex-9.7.0/src/IECorePython/SRGBToLinearOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SRGBToLinearOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/SRGBToLinearOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SampledSceneInterfaceBinding.cpp b/cortex-9.7.0/src/IECorePython/SampledSceneInterfaceBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SampledSceneInterfaceBinding.cpp rename to cortex-9.7.0/src/IECorePython/SampledSceneInterfaceBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SceneCacheBinding.cpp b/cortex-9.7.0/src/IECorePython/SceneCacheBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SceneCacheBinding.cpp rename to cortex-9.7.0/src/IECorePython/SceneCacheBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SceneInterfaceBinding.cpp b/cortex-9.7.0/src/IECorePython/SceneInterfaceBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SceneInterfaceBinding.cpp rename to cortex-9.7.0/src/IECorePython/SceneInterfaceBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ScopedGILLock.cpp b/cortex-9.7.0/src/IECorePython/ScopedGILLock.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ScopedGILLock.cpp rename to cortex-9.7.0/src/IECorePython/ScopedGILLock.cpp diff --git a/cortex-9.6.0/src/IECorePython/ScopedGILRelease.cpp b/cortex-9.7.0/src/IECorePython/ScopedGILRelease.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ScopedGILRelease.cpp rename to cortex-9.7.0/src/IECorePython/ScopedGILRelease.cpp diff --git a/cortex-9.6.0/src/IECorePython/SearchPathBinding.cpp b/cortex-9.7.0/src/IECorePython/SearchPathBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SearchPathBinding.cpp rename to cortex-9.7.0/src/IECorePython/SearchPathBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ShaderBinding.cpp b/cortex-9.7.0/src/IECorePython/ShaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ShaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/ShaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SharedSceneInterfacesBinding.cpp b/cortex-9.7.0/src/IECorePython/SharedSceneInterfacesBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SharedSceneInterfacesBinding.cpp rename to cortex-9.7.0/src/IECorePython/SharedSceneInterfacesBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SimpleTypedDataBinding.cpp b/cortex-9.7.0/src/IECorePython/SimpleTypedDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SimpleTypedDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/SimpleTypedDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SimpleTypedParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/SimpleTypedParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SimpleTypedParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/SimpleTypedParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SmoothSkinningDataBinding.cpp b/cortex-9.7.0/src/IECorePython/SmoothSkinningDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SmoothSkinningDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/SmoothSkinningDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SpherePrimitiveBinding.cpp b/cortex-9.7.0/src/IECorePython/SpherePrimitiveBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SpherePrimitiveBinding.cpp rename to cortex-9.7.0/src/IECorePython/SpherePrimitiveBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp b/cortex-9.7.0/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SplineBinding.cpp b/cortex-9.7.0/src/IECorePython/SplineBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SplineBinding.cpp rename to cortex-9.7.0/src/IECorePython/SplineBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SplineDataBinding.cpp b/cortex-9.7.0/src/IECorePython/SplineDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SplineDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/SplineDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SplineParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/SplineParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SplineParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/SplineParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SplineToImageBinding.cpp b/cortex-9.7.0/src/IECorePython/SplineToImageBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SplineToImageBinding.cpp rename to cortex-9.7.0/src/IECorePython/SplineToImageBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/StandardRadialLensModelBinding.cpp b/cortex-9.7.0/src/IECorePython/StandardRadialLensModelBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/StandardRadialLensModelBinding.cpp rename to cortex-9.7.0/src/IECorePython/StandardRadialLensModelBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/StateRenderableBinding.cpp b/cortex-9.7.0/src/IECorePython/StateRenderableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/StateRenderableBinding.cpp rename to cortex-9.7.0/src/IECorePython/StateRenderableBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/SummedAreaOpBinding.cpp b/cortex-9.7.0/src/IECorePython/SummedAreaOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/SummedAreaOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/SummedAreaOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TGAImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/TGAImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TGAImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/TGAImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TGAImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/TGAImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TGAImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TGAImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TIFFImageReaderBinding.cpp b/cortex-9.7.0/src/IECorePython/TIFFImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TIFFImageReaderBinding.cpp rename to cortex-9.7.0/src/IECorePython/TIFFImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TIFFImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/TIFFImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TIFFImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TIFFImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimeCodeDataBinding.cpp b/cortex-9.7.0/src/IECorePython/TimeCodeDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimeCodeDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimeCodeDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimeCodeParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/TimeCodeParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimeCodeParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimeCodeParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimeDurationDataBinding.cpp b/cortex-9.7.0/src/IECorePython/TimeDurationDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimeDurationDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimeDurationDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimeDurationParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/TimeDurationParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimeDurationParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimeDurationParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimePeriodBinding.cpp b/cortex-9.7.0/src/IECorePython/TimePeriodBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimePeriodBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimePeriodBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimePeriodDataBinding.cpp b/cortex-9.7.0/src/IECorePython/TimePeriodDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimePeriodDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimePeriodDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimePeriodParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/TimePeriodParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimePeriodParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimePeriodParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TimerBinding.cpp b/cortex-9.7.0/src/IECorePython/TimerBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TimerBinding.cpp rename to cortex-9.7.0/src/IECorePython/TimerBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ToCoreConverterBinding.cpp b/cortex-9.7.0/src/IECorePython/ToCoreConverterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ToCoreConverterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ToCoreConverterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp b/cortex-9.7.0/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TransformBinding.cpp b/cortex-9.7.0/src/IECorePython/TransformBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TransformBinding.cpp rename to cortex-9.7.0/src/IECorePython/TransformBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TransformOpBinding.cpp b/cortex-9.7.0/src/IECorePython/TransformOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TransformOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/TransformOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TransformationMatrixBinding.cpp b/cortex-9.7.0/src/IECorePython/TransformationMatrixBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TransformationMatrixBinding.cpp rename to cortex-9.7.0/src/IECorePython/TransformationMatrixBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TransformationMatrixDataBinding.cpp b/cortex-9.7.0/src/IECorePython/TransformationMatrixDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TransformationMatrixDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/TransformationMatrixDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TriangleAlgoBinding.cpp b/cortex-9.7.0/src/IECorePython/TriangleAlgoBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TriangleAlgoBinding.cpp rename to cortex-9.7.0/src/IECorePython/TriangleAlgoBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TriangulateOpBinding.cpp b/cortex-9.7.0/src/IECorePython/TriangulateOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TriangulateOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/TriangulateOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TriangulatorBinding.cpp b/cortex-9.7.0/src/IECorePython/TriangulatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TriangulatorBinding.cpp rename to cortex-9.7.0/src/IECorePython/TriangulatorBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TurbulenceBinding.cpp b/cortex-9.7.0/src/IECorePython/TurbulenceBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TurbulenceBinding.cpp rename to cortex-9.7.0/src/IECorePython/TurbulenceBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TypeIdBinding.cpp b/cortex-9.7.0/src/IECorePython/TypeIdBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TypeIdBinding.cpp rename to cortex-9.7.0/src/IECorePython/TypeIdBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TypedObjectParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/TypedObjectParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TypedObjectParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TypedObjectParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TypedPrimitiveOpBinding.cpp b/cortex-9.7.0/src/IECorePython/TypedPrimitiveOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TypedPrimitiveOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/TypedPrimitiveOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/TypedPrimitiveParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/TypedPrimitiveParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/TypedPrimitiveParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/TypedPrimitiveParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/UVDistortOpBinding.cpp b/cortex-9.7.0/src/IECorePython/UVDistortOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/UVDistortOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/UVDistortOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/UnicodeToStringBinding.cpp b/cortex-9.7.0/src/IECorePython/UnicodeToStringBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/UnicodeToStringBinding.cpp rename to cortex-9.7.0/src/IECorePython/UnicodeToStringBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/ValidatedStringParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/ValidatedStringParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/ValidatedStringParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/ValidatedStringParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/VectorDataFilterOpBinding.cpp b/cortex-9.7.0/src/IECorePython/VectorDataFilterOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/VectorDataFilterOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/VectorDataFilterOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/VectorTypedDataBinding.cpp b/cortex-9.7.0/src/IECorePython/VectorTypedDataBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/VectorTypedDataBinding.cpp rename to cortex-9.7.0/src/IECorePython/VectorTypedDataBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/VectorTypedParameterBinding.cpp b/cortex-9.7.0/src/IECorePython/VectorTypedParameterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/VectorTypedParameterBinding.cpp rename to cortex-9.7.0/src/IECorePython/VectorTypedParameterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/VisibleRenderableBinding.cpp b/cortex-9.7.0/src/IECorePython/VisibleRenderableBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/VisibleRenderableBinding.cpp rename to cortex-9.7.0/src/IECorePython/VisibleRenderableBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/WarpOpBinding.cpp b/cortex-9.7.0/src/IECorePython/WarpOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/WarpOpBinding.cpp rename to cortex-9.7.0/src/IECorePython/WarpOpBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/WrapperGarbageCollector.cpp b/cortex-9.7.0/src/IECorePython/WrapperGarbageCollector.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/WrapperGarbageCollector.cpp rename to cortex-9.7.0/src/IECorePython/WrapperGarbageCollector.cpp diff --git a/cortex-9.6.0/src/IECorePython/WriterBinding.cpp b/cortex-9.7.0/src/IECorePython/WriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/WriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/WriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePython/YUVImageWriterBinding.cpp b/cortex-9.7.0/src/IECorePython/YUVImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePython/YUVImageWriterBinding.cpp rename to cortex-9.7.0/src/IECorePython/YUVImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECorePythonModule/IECore.cpp b/cortex-9.7.0/src/IECorePythonModule/IECore.cpp similarity index 100% rename from cortex-9.6.0/src/IECorePythonModule/IECore.cpp rename to cortex-9.7.0/src/IECorePythonModule/IECore.cpp diff --git a/cortex-9.6.0/src/IECoreRI/Convert.cpp b/cortex-9.7.0/src/IECoreRI/Convert.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/Convert.cpp rename to cortex-9.7.0/src/IECoreRI/Convert.cpp diff --git a/cortex-9.6.0/src/IECoreRI/DTEXDeepImageReader.cpp b/cortex-9.7.0/src/IECoreRI/DTEXDeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/DTEXDeepImageReader.cpp rename to cortex-9.7.0/src/IECoreRI/DTEXDeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECoreRI/DTEXDeepImageWriter.cpp b/cortex-9.7.0/src/IECoreRI/DTEXDeepImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/DTEXDeepImageWriter.cpp rename to cortex-9.7.0/src/IECoreRI/DTEXDeepImageWriter.cpp diff --git a/cortex-9.6.0/src/IECoreRI/Dspy.cpp b/cortex-9.7.0/src/IECoreRI/Dspy.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/Dspy.cpp rename to cortex-9.7.0/src/IECoreRI/Dspy.cpp diff --git a/cortex-9.6.0/src/IECoreRI/GXEvaluator.cpp b/cortex-9.7.0/src/IECoreRI/GXEvaluator.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/GXEvaluator.cpp rename to cortex-9.7.0/src/IECoreRI/GXEvaluator.cpp diff --git a/cortex-9.6.0/src/IECoreRI/IECoreRI.cpp b/cortex-9.7.0/src/IECoreRI/IECoreRI.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/IECoreRI.cpp rename to cortex-9.7.0/src/IECoreRI/IECoreRI.cpp diff --git a/cortex-9.6.0/src/IECoreRI/PTCParticleIO.cpp b/cortex-9.7.0/src/IECoreRI/PTCParticleIO.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/PTCParticleIO.cpp rename to cortex-9.7.0/src/IECoreRI/PTCParticleIO.cpp diff --git a/cortex-9.6.0/src/IECoreRI/PTCParticleReader.cpp b/cortex-9.7.0/src/IECoreRI/PTCParticleReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/PTCParticleReader.cpp rename to cortex-9.7.0/src/IECoreRI/PTCParticleReader.cpp diff --git a/cortex-9.6.0/src/IECoreRI/PTCParticleWriter.cpp b/cortex-9.7.0/src/IECoreRI/PTCParticleWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/PTCParticleWriter.cpp rename to cortex-9.7.0/src/IECoreRI/PTCParticleWriter.cpp diff --git a/cortex-9.6.0/src/IECoreRI/ParameterList.cpp b/cortex-9.7.0/src/IECoreRI/ParameterList.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/ParameterList.cpp rename to cortex-9.7.0/src/IECoreRI/ParameterList.cpp diff --git a/cortex-9.6.0/src/IECoreRI/PrimitiveVariableList.cpp b/cortex-9.7.0/src/IECoreRI/PrimitiveVariableList.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/PrimitiveVariableList.cpp rename to cortex-9.7.0/src/IECoreRI/PrimitiveVariableList.cpp diff --git a/cortex-9.6.0/src/IECoreRI/RIBWriter.cpp b/cortex-9.7.0/src/IECoreRI/RIBWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/RIBWriter.cpp rename to cortex-9.7.0/src/IECoreRI/RIBWriter.cpp diff --git a/cortex-9.6.0/src/IECoreRI/Renderer.cpp b/cortex-9.7.0/src/IECoreRI/Renderer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/Renderer.cpp rename to cortex-9.7.0/src/IECoreRI/Renderer.cpp diff --git a/cortex-9.6.0/src/IECoreRI/RendererImplementation.cpp b/cortex-9.7.0/src/IECoreRI/RendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/RendererImplementation.cpp rename to cortex-9.7.0/src/IECoreRI/RendererImplementation.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SHWDeepImageReader.cpp b/cortex-9.7.0/src/IECoreRI/SHWDeepImageReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SHWDeepImageReader.cpp rename to cortex-9.7.0/src/IECoreRI/SHWDeepImageReader.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SHWDeepImageWriter.cpp b/cortex-9.7.0/src/IECoreRI/SHWDeepImageWriter.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SHWDeepImageWriter.cpp rename to cortex-9.7.0/src/IECoreRI/SHWDeepImageWriter.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SLOReader.cpp b/cortex-9.7.0/src/IECoreRI/SLOReader.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SLOReader.cpp rename to cortex-9.7.0/src/IECoreRI/SLOReader.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SXExecutor.cpp b/cortex-9.7.0/src/IECoreRI/SXExecutor.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SXExecutor.cpp rename to cortex-9.7.0/src/IECoreRI/SXExecutor.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SXRenderer.cpp b/cortex-9.7.0/src/IECoreRI/SXRenderer.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SXRenderer.cpp rename to cortex-9.7.0/src/IECoreRI/SXRenderer.cpp diff --git a/cortex-9.6.0/src/IECoreRI/SXRendererImplementation.cpp b/cortex-9.7.0/src/IECoreRI/SXRendererImplementation.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/SXRendererImplementation.cpp rename to cortex-9.7.0/src/IECoreRI/SXRendererImplementation.cpp diff --git a/cortex-9.6.0/src/IECoreRI/ScopedContext.cpp b/cortex-9.7.0/src/IECoreRI/ScopedContext.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/ScopedContext.cpp rename to cortex-9.7.0/src/IECoreRI/ScopedContext.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/GXEvaluatorBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/GXEvaluatorBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/GXEvaluatorBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/GXEvaluatorBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/IECoreRIBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/IECoreRIBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/IECoreRIBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/IECoreRIBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/RIBWriterBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/RIBWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/RIBWriterBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/RIBWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/RendererBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/RendererBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/RendererBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/SLOReaderBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/SLOReaderBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/SLOReaderBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/SLOReaderBinding.cpp diff --git a/cortex-9.6.0/src/IECoreRI/bindings/SXRendererBinding.cpp b/cortex-9.7.0/src/IECoreRI/bindings/SXRendererBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreRI/bindings/SXRendererBinding.cpp rename to cortex-9.7.0/src/IECoreRI/bindings/SXRendererBinding.cpp diff --git a/cortex-9.6.0/src/IECoreTruelight/IECoreTruelight.cpp b/cortex-9.7.0/src/IECoreTruelight/IECoreTruelight.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreTruelight/IECoreTruelight.cpp rename to cortex-9.7.0/src/IECoreTruelight/IECoreTruelight.cpp diff --git a/cortex-9.6.0/src/IECoreTruelight/TruelightColorTransformOp.cpp b/cortex-9.7.0/src/IECoreTruelight/TruelightColorTransformOp.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreTruelight/TruelightColorTransformOp.cpp rename to cortex-9.7.0/src/IECoreTruelight/TruelightColorTransformOp.cpp diff --git a/cortex-9.6.0/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp b/cortex-9.7.0/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp rename to cortex-9.7.0/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp diff --git a/cortex-9.6.0/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp b/cortex-9.7.0/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.6.0/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp rename to cortex-9.7.0/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp diff --git a/cortex-9.6.0/src/rmanDisplays/ieDisplay/IEDisplay.cpp b/cortex-9.7.0/src/rmanDisplays/ieDisplay/IEDisplay.cpp similarity index 100% rename from cortex-9.6.0/src/rmanDisplays/ieDisplay/IEDisplay.cpp rename to cortex-9.7.0/src/rmanDisplays/ieDisplay/IEDisplay.cpp diff --git a/cortex-9.6.0/src/rmanProcedurals/python/Procedural.cpp b/cortex-9.7.0/src/rmanProcedurals/python/Procedural.cpp similarity index 100% rename from cortex-9.6.0/src/rmanProcedurals/python/Procedural.cpp rename to cortex-9.7.0/src/rmanProcedurals/python/Procedural.cpp diff --git a/cortex-9.6.0/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py b/cortex-9.7.0/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py rename to cortex-9.7.0/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.6.0/test/IECore/All.py b/cortex-9.7.0/test/IECore/All.py similarity index 100% rename from cortex-9.6.0/test/IECore/All.py rename to cortex-9.7.0/test/IECore/All.py diff --git a/cortex-9.6.0/test/IECore/AngleConversionTest.py b/cortex-9.7.0/test/IECore/AngleConversionTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/AngleConversionTest.py rename to cortex-9.7.0/test/IECore/AngleConversionTest.py diff --git a/cortex-9.6.0/test/IECore/AttributeStateTest.py b/cortex-9.7.0/test/IECore/AttributeStateTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/AttributeStateTest.py rename to cortex-9.7.0/test/IECore/AttributeStateTest.py diff --git a/cortex-9.6.0/test/IECore/BasicPreset.py b/cortex-9.7.0/test/IECore/BasicPreset.py similarity index 100% rename from cortex-9.6.0/test/IECore/BasicPreset.py rename to cortex-9.7.0/test/IECore/BasicPreset.py diff --git a/cortex-9.6.0/test/IECore/BezierAlgoTest.py b/cortex-9.7.0/test/IECore/BezierAlgoTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/BezierAlgoTest.py rename to cortex-9.7.0/test/IECore/BezierAlgoTest.py diff --git a/cortex-9.6.0/test/IECore/BinaryFrameList.py b/cortex-9.7.0/test/IECore/BinaryFrameList.py similarity index 100% rename from cortex-9.6.0/test/IECore/BinaryFrameList.py rename to cortex-9.7.0/test/IECore/BinaryFrameList.py diff --git a/cortex-9.6.0/test/IECore/BlindDataHolder.py b/cortex-9.7.0/test/IECore/BlindDataHolder.py similarity index 100% rename from cortex-9.6.0/test/IECore/BlindDataHolder.py rename to cortex-9.7.0/test/IECore/BlindDataHolder.py diff --git a/cortex-9.6.0/test/IECore/BoolVectorData.py b/cortex-9.7.0/test/IECore/BoolVectorData.py similarity index 100% rename from cortex-9.6.0/test/IECore/BoolVectorData.py rename to cortex-9.7.0/test/IECore/BoolVectorData.py diff --git a/cortex-9.6.0/test/IECore/BoostFilesystemPaths.py b/cortex-9.7.0/test/IECore/BoostFilesystemPaths.py similarity index 100% rename from cortex-9.6.0/test/IECore/BoostFilesystemPaths.py rename to cortex-9.7.0/test/IECore/BoostFilesystemPaths.py diff --git a/cortex-9.6.0/test/IECore/BoostUnitTestTest.cpp b/cortex-9.7.0/test/IECore/BoostUnitTestTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/BoostUnitTestTest.cpp rename to cortex-9.7.0/test/IECore/BoostUnitTestTest.cpp diff --git a/cortex-9.6.0/test/IECore/BoostUnitTestTest.h b/cortex-9.7.0/test/IECore/BoostUnitTestTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/BoostUnitTestTest.h rename to cortex-9.7.0/test/IECore/BoostUnitTestTest.h diff --git a/cortex-9.6.0/test/IECore/BoundedKDTree.py b/cortex-9.7.0/test/IECore/BoundedKDTree.py similarity index 100% rename from cortex-9.6.0/test/IECore/BoundedKDTree.py rename to cortex-9.7.0/test/IECore/BoundedKDTree.py diff --git a/cortex-9.6.0/test/IECore/CINImageReader.py b/cortex-9.7.0/test/IECore/CINImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/CINImageReader.py rename to cortex-9.7.0/test/IECore/CINImageReader.py diff --git a/cortex-9.6.0/test/IECore/CINImageWriter.py b/cortex-9.7.0/test/IECore/CINImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/CINImageWriter.py rename to cortex-9.7.0/test/IECore/CINImageWriter.py diff --git a/cortex-9.6.0/test/IECore/CachedReader.py b/cortex-9.7.0/test/IECore/CachedReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/CachedReader.py rename to cortex-9.7.0/test/IECore/CachedReader.py diff --git a/cortex-9.6.0/test/IECore/CamelCaseTest.py b/cortex-9.7.0/test/IECore/CamelCaseTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CamelCaseTest.py rename to cortex-9.7.0/test/IECore/CamelCaseTest.py diff --git a/cortex-9.6.0/test/IECore/Camera.py b/cortex-9.7.0/test/IECore/Camera.py similarity index 100% rename from cortex-9.6.0/test/IECore/Camera.py rename to cortex-9.7.0/test/IECore/Camera.py diff --git a/cortex-9.6.0/test/IECore/CameraControllerTest.py b/cortex-9.7.0/test/IECore/CameraControllerTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CameraControllerTest.py rename to cortex-9.7.0/test/IECore/CameraControllerTest.py diff --git a/cortex-9.6.0/test/IECore/CapturingMessageHandler.py b/cortex-9.7.0/test/IECore/CapturingMessageHandler.py similarity index 100% rename from cortex-9.6.0/test/IECore/CapturingMessageHandler.py rename to cortex-9.7.0/test/IECore/CapturingMessageHandler.py diff --git a/cortex-9.6.0/test/IECore/CapturingRendererTest.py b/cortex-9.7.0/test/IECore/CapturingRendererTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CapturingRendererTest.py rename to cortex-9.7.0/test/IECore/CapturingRendererTest.py diff --git a/cortex-9.6.0/test/IECore/ClampOpTest.py b/cortex-9.7.0/test/IECore/ClampOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ClampOpTest.py rename to cortex-9.7.0/test/IECore/ClampOpTest.py diff --git a/cortex-9.6.0/test/IECore/ClassLoader.py b/cortex-9.7.0/test/IECore/ClassLoader.py similarity index 100% rename from cortex-9.6.0/test/IECore/ClassLoader.py rename to cortex-9.7.0/test/IECore/ClassLoader.py diff --git a/cortex-9.6.0/test/IECore/ClassParameterTest.py b/cortex-9.7.0/test/IECore/ClassParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ClassParameterTest.py rename to cortex-9.7.0/test/IECore/ClassParameterTest.py diff --git a/cortex-9.6.0/test/IECore/ClassVectorParameterTest.py b/cortex-9.7.0/test/IECore/ClassVectorParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ClassVectorParameterTest.py rename to cortex-9.7.0/test/IECore/ClassVectorParameterTest.py diff --git a/cortex-9.6.0/test/IECore/ClippingPlaneTest.py b/cortex-9.7.0/test/IECore/ClippingPlaneTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ClippingPlaneTest.py rename to cortex-9.7.0/test/IECore/ClippingPlaneTest.py diff --git a/cortex-9.6.0/test/IECore/ColorSpaceTransformOpTest.py b/cortex-9.7.0/test/IECore/ColorSpaceTransformOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ColorSpaceTransformOpTest.py rename to cortex-9.7.0/test/IECore/ColorSpaceTransformOpTest.py diff --git a/cortex-9.6.0/test/IECore/ColorTransformOpTest.py b/cortex-9.7.0/test/IECore/ColorTransformOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ColorTransformOpTest.py rename to cortex-9.7.0/test/IECore/ColorTransformOpTest.py diff --git a/cortex-9.6.0/test/IECore/ColorTransformTest.cpp b/cortex-9.7.0/test/IECore/ColorTransformTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/ColorTransformTest.cpp rename to cortex-9.7.0/test/IECore/ColorTransformTest.cpp diff --git a/cortex-9.6.0/test/IECore/ColorTransformTest.h b/cortex-9.7.0/test/IECore/ColorTransformTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/ColorTransformTest.h rename to cortex-9.7.0/test/IECore/ColorTransformTest.h diff --git a/cortex-9.6.0/test/IECore/CompilerTest.cpp b/cortex-9.7.0/test/IECore/CompilerTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/CompilerTest.cpp rename to cortex-9.7.0/test/IECore/CompilerTest.cpp diff --git a/cortex-9.6.0/test/IECore/CompilerTest.h b/cortex-9.7.0/test/IECore/CompilerTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/CompilerTest.h rename to cortex-9.7.0/test/IECore/CompilerTest.h diff --git a/cortex-9.6.0/test/IECore/CompoundData.py b/cortex-9.7.0/test/IECore/CompoundData.py similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundData.py rename to cortex-9.7.0/test/IECore/CompoundData.py diff --git a/cortex-9.6.0/test/IECore/CompoundDataTest.cpp b/cortex-9.7.0/test/IECore/CompoundDataTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundDataTest.cpp rename to cortex-9.7.0/test/IECore/CompoundDataTest.cpp diff --git a/cortex-9.6.0/test/IECore/CompoundDataTest.h b/cortex-9.7.0/test/IECore/CompoundDataTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundDataTest.h rename to cortex-9.7.0/test/IECore/CompoundDataTest.h diff --git a/cortex-9.6.0/test/IECore/CompoundObject.py b/cortex-9.7.0/test/IECore/CompoundObject.py similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundObject.py rename to cortex-9.7.0/test/IECore/CompoundObject.py diff --git a/cortex-9.6.0/test/IECore/CompoundObjectTest.cpp b/cortex-9.7.0/test/IECore/CompoundObjectTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundObjectTest.cpp rename to cortex-9.7.0/test/IECore/CompoundObjectTest.cpp diff --git a/cortex-9.6.0/test/IECore/CompoundObjectTest.h b/cortex-9.7.0/test/IECore/CompoundObjectTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundObjectTest.h rename to cortex-9.7.0/test/IECore/CompoundObjectTest.h diff --git a/cortex-9.6.0/test/IECore/CompoundParameterTest.py b/cortex-9.7.0/test/IECore/CompoundParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundParameterTest.py rename to cortex-9.7.0/test/IECore/CompoundParameterTest.py diff --git a/cortex-9.6.0/test/IECore/CompoundVectorParameterTest.py b/cortex-9.7.0/test/IECore/CompoundVectorParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CompoundVectorParameterTest.py rename to cortex-9.7.0/test/IECore/CompoundVectorParameterTest.py diff --git a/cortex-9.6.0/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py b/cortex-9.7.0/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py rename to cortex-9.7.0/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py diff --git a/cortex-9.6.0/test/IECore/ComputationCacheTest.cpp b/cortex-9.7.0/test/IECore/ComputationCacheTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/ComputationCacheTest.cpp rename to cortex-9.7.0/test/IECore/ComputationCacheTest.cpp diff --git a/cortex-9.6.0/test/IECore/ComputationCacheTest.h b/cortex-9.7.0/test/IECore/ComputationCacheTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/ComputationCacheTest.h rename to cortex-9.7.0/test/IECore/ComputationCacheTest.h diff --git a/cortex-9.6.0/test/IECore/ConfigLoaderTest.py b/cortex-9.7.0/test/IECore/ConfigLoaderTest.py similarity index 94% rename from cortex-9.6.0/test/IECore/ConfigLoaderTest.py rename to cortex-9.7.0/test/IECore/ConfigLoaderTest.py index bd9110f3be..9db4621f05 100644 --- a/cortex-9.6.0/test/IECore/ConfigLoaderTest.py +++ b/cortex-9.7.0/test/IECore/ConfigLoaderTest.py @@ -215,7 +215,25 @@ def testFile( self ) : expectedFile = os.path.abspath( os.path.join( path, "config.py" ) ) self.assertEqual( contextDict["myFile"], expectedFile ) - + + def testDuplicatePathsIgnored( self ) : + + contextDict = {} + IECore.loadConfig( + + IECore.SearchPath( + os.path.dirname( __file__ ) + "/config/orderOne:" + + os.path.dirname( __file__ ) + "/config/orderTwo:" + + os.path.dirname( __file__ ) + "/config/orderOne", + ":" + ), + + contextDict, + + ) + + self.assertEqual( contextDict["a"], 2 ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.6.0/test/IECore/ContrastSmoothSkinningWeightsOpTest.py b/cortex-9.7.0/test/IECore/ContrastSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ContrastSmoothSkinningWeightsOpTest.py rename to cortex-9.7.0/test/IECore/ContrastSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.6.0/test/IECore/CoordinateSystemTest.py b/cortex-9.7.0/test/IECore/CoordinateSystemTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CoordinateSystemTest.py rename to cortex-9.7.0/test/IECore/CoordinateSystemTest.py diff --git a/cortex-9.6.0/test/IECore/CubeColorLookupDataTest.py b/cortex-9.7.0/test/IECore/CubeColorLookupDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CubeColorLookupDataTest.py rename to cortex-9.7.0/test/IECore/CubeColorLookupDataTest.py diff --git a/cortex-9.6.0/test/IECore/CubeColorLookupTest.py b/cortex-9.7.0/test/IECore/CubeColorLookupTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CubeColorLookupTest.py rename to cortex-9.7.0/test/IECore/CubeColorLookupTest.py diff --git a/cortex-9.6.0/test/IECore/CubeColorTransformOpTest.py b/cortex-9.7.0/test/IECore/CubeColorTransformOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CubeColorTransformOpTest.py rename to cortex-9.7.0/test/IECore/CubeColorTransformOpTest.py diff --git a/cortex-9.6.0/test/IECore/CubicBasisTest.py b/cortex-9.7.0/test/IECore/CubicBasisTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CubicBasisTest.py rename to cortex-9.7.0/test/IECore/CubicBasisTest.py diff --git a/cortex-9.6.0/test/IECore/Curry.py b/cortex-9.7.0/test/IECore/Curry.py similarity index 100% rename from cortex-9.6.0/test/IECore/Curry.py rename to cortex-9.7.0/test/IECore/Curry.py diff --git a/cortex-9.6.0/test/IECore/CurveExtrudeOp.py b/cortex-9.7.0/test/IECore/CurveExtrudeOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurveExtrudeOp.py rename to cortex-9.7.0/test/IECore/CurveExtrudeOp.py diff --git a/cortex-9.6.0/test/IECore/CurveLineariserTest.py b/cortex-9.7.0/test/IECore/CurveLineariserTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurveLineariserTest.py rename to cortex-9.7.0/test/IECore/CurveLineariserTest.py diff --git a/cortex-9.6.0/test/IECore/CurveTangentsOpTest.py b/cortex-9.7.0/test/IECore/CurveTangentsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurveTangentsOpTest.py rename to cortex-9.7.0/test/IECore/CurveTangentsOpTest.py diff --git a/cortex-9.6.0/test/IECore/CurveTracerTest.py b/cortex-9.7.0/test/IECore/CurveTracerTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurveTracerTest.py rename to cortex-9.7.0/test/IECore/CurveTracerTest.py diff --git a/cortex-9.6.0/test/IECore/CurvesMergeOpTest.py b/cortex-9.7.0/test/IECore/CurvesMergeOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurvesMergeOpTest.py rename to cortex-9.7.0/test/IECore/CurvesMergeOpTest.py diff --git a/cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorTest.py b/cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorTest.py rename to cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorTest.py diff --git a/cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp b/cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp rename to cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp diff --git a/cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h b/cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h rename to cortex-9.7.0/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h diff --git a/cortex-9.6.0/test/IECore/CurvesPrimitiveTest.py b/cortex-9.7.0/test/IECore/CurvesPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/CurvesPrimitiveTest.py rename to cortex-9.7.0/test/IECore/CurvesPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECore/DPXImageReader.py b/cortex-9.7.0/test/IECore/DPXImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/DPXImageReader.py rename to cortex-9.7.0/test/IECore/DPXImageReader.py diff --git a/cortex-9.6.0/test/IECore/DPXImageWriter.py b/cortex-9.7.0/test/IECore/DPXImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/DPXImageWriter.py rename to cortex-9.7.0/test/IECore/DPXImageWriter.py diff --git a/cortex-9.6.0/test/IECore/DataAlgoTest.py b/cortex-9.7.0/test/IECore/DataAlgoTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataAlgoTest.py rename to cortex-9.7.0/test/IECore/DataAlgoTest.py diff --git a/cortex-9.6.0/test/IECore/DataCastOp.py b/cortex-9.7.0/test/IECore/DataCastOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataCastOp.py rename to cortex-9.7.0/test/IECore/DataCastOp.py diff --git a/cortex-9.6.0/test/IECore/DataConversionTest.cpp b/cortex-9.7.0/test/IECore/DataConversionTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/DataConversionTest.cpp rename to cortex-9.7.0/test/IECore/DataConversionTest.cpp diff --git a/cortex-9.6.0/test/IECore/DataConversionTest.h b/cortex-9.7.0/test/IECore/DataConversionTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/DataConversionTest.h rename to cortex-9.7.0/test/IECore/DataConversionTest.h diff --git a/cortex-9.6.0/test/IECore/DataConvertOpTest.py b/cortex-9.7.0/test/IECore/DataConvertOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataConvertOpTest.py rename to cortex-9.7.0/test/IECore/DataConvertOpTest.py diff --git a/cortex-9.6.0/test/IECore/DataConvertTest.cpp b/cortex-9.7.0/test/IECore/DataConvertTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/DataConvertTest.cpp rename to cortex-9.7.0/test/IECore/DataConvertTest.cpp diff --git a/cortex-9.6.0/test/IECore/DataConvertTest.h b/cortex-9.7.0/test/IECore/DataConvertTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/DataConvertTest.h rename to cortex-9.7.0/test/IECore/DataConvertTest.h diff --git a/cortex-9.6.0/test/IECore/DataInterleaveOpTest.py b/cortex-9.7.0/test/IECore/DataInterleaveOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataInterleaveOpTest.py rename to cortex-9.7.0/test/IECore/DataInterleaveOpTest.py diff --git a/cortex-9.6.0/test/IECore/DataPromoteOp.py b/cortex-9.7.0/test/IECore/DataPromoteOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataPromoteOp.py rename to cortex-9.7.0/test/IECore/DataPromoteOp.py diff --git a/cortex-9.6.0/test/IECore/DataTraitsTest.py b/cortex-9.7.0/test/IECore/DataTraitsTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DataTraitsTest.py rename to cortex-9.7.0/test/IECore/DataTraitsTest.py diff --git a/cortex-9.6.0/test/IECore/DateTimeDataTest.py b/cortex-9.7.0/test/IECore/DateTimeDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DateTimeDataTest.py rename to cortex-9.7.0/test/IECore/DateTimeDataTest.py diff --git a/cortex-9.6.0/test/IECore/DateTimeParameterTest.py b/cortex-9.7.0/test/IECore/DateTimeParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DateTimeParameterTest.py rename to cortex-9.7.0/test/IECore/DateTimeParameterTest.py diff --git a/cortex-9.6.0/test/IECore/DeepPixelTest.py b/cortex-9.7.0/test/IECore/DeepPixelTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DeepPixelTest.py rename to cortex-9.7.0/test/IECore/DeepPixelTest.py diff --git a/cortex-9.6.0/test/IECore/DespatchTypedDataTest.cpp b/cortex-9.7.0/test/IECore/DespatchTypedDataTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/DespatchTypedDataTest.cpp rename to cortex-9.7.0/test/IECore/DespatchTypedDataTest.cpp diff --git a/cortex-9.6.0/test/IECore/DespatchTypedDataTest.h b/cortex-9.7.0/test/IECore/DespatchTypedDataTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/DespatchTypedDataTest.h rename to cortex-9.7.0/test/IECore/DespatchTypedDataTest.h diff --git a/cortex-9.6.0/test/IECore/DiskPrimitiveTest.py b/cortex-9.7.0/test/IECore/DiskPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DiskPrimitiveTest.py rename to cortex-9.7.0/test/IECore/DiskPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECore/DisplayDriverTest.py b/cortex-9.7.0/test/IECore/DisplayDriverTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DisplayDriverTest.py rename to cortex-9.7.0/test/IECore/DisplayDriverTest.py diff --git a/cortex-9.6.0/test/IECore/DisplayTest.py b/cortex-9.7.0/test/IECore/DisplayTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/DisplayTest.py rename to cortex-9.7.0/test/IECore/DisplayTest.py diff --git a/cortex-9.6.0/test/IECore/EXRDeepImageReaderTest.py b/cortex-9.7.0/test/IECore/EXRDeepImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/EXRDeepImageReaderTest.py rename to cortex-9.7.0/test/IECore/EXRDeepImageReaderTest.py diff --git a/cortex-9.6.0/test/IECore/EXRDeepImageWriterTest.py b/cortex-9.7.0/test/IECore/EXRDeepImageWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/EXRDeepImageWriterTest.py rename to cortex-9.7.0/test/IECore/EXRDeepImageWriterTest.py diff --git a/cortex-9.6.0/test/IECore/EXRImageReader.py b/cortex-9.7.0/test/IECore/EXRImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/EXRImageReader.py rename to cortex-9.7.0/test/IECore/EXRImageReader.py diff --git a/cortex-9.6.0/test/IECore/EXRImageWriter.py b/cortex-9.7.0/test/IECore/EXRImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/EXRImageWriter.py rename to cortex-9.7.0/test/IECore/EXRImageWriter.py diff --git a/cortex-9.6.0/test/IECore/Enum.py b/cortex-9.7.0/test/IECore/Enum.py similarity index 100% rename from cortex-9.6.0/test/IECore/Enum.py rename to cortex-9.7.0/test/IECore/Enum.py diff --git a/cortex-9.6.0/test/IECore/EnvMapSamplerTest.py b/cortex-9.7.0/test/IECore/EnvMapSamplerTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/EnvMapSamplerTest.py rename to cortex-9.7.0/test/IECore/EnvMapSamplerTest.py diff --git a/cortex-9.6.0/test/IECore/ExclusionFrameList.py b/cortex-9.7.0/test/IECore/ExclusionFrameList.py similarity index 100% rename from cortex-9.6.0/test/IECore/ExclusionFrameList.py rename to cortex-9.7.0/test/IECore/ExclusionFrameList.py diff --git a/cortex-9.6.0/test/IECore/ExternalProceduralTest.py b/cortex-9.7.0/test/IECore/ExternalProceduralTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ExternalProceduralTest.py rename to cortex-9.7.0/test/IECore/ExternalProceduralTest.py diff --git a/cortex-9.6.0/test/IECore/FaceAreaOpTest.py b/cortex-9.7.0/test/IECore/FaceAreaOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/FaceAreaOpTest.py rename to cortex-9.7.0/test/IECore/FaceAreaOpTest.py diff --git a/cortex-9.6.0/test/IECore/FaceVaryingPromotionOpTest.py b/cortex-9.7.0/test/IECore/FaceVaryingPromotionOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/FaceVaryingPromotionOpTest.py rename to cortex-9.7.0/test/IECore/FaceVaryingPromotionOpTest.py diff --git a/cortex-9.6.0/test/IECore/FileSequence.py b/cortex-9.7.0/test/IECore/FileSequence.py similarity index 100% rename from cortex-9.6.0/test/IECore/FileSequence.py rename to cortex-9.7.0/test/IECore/FileSequence.py diff --git a/cortex-9.6.0/test/IECore/FileSequenceParameter.py b/cortex-9.7.0/test/IECore/FileSequenceParameter.py similarity index 100% rename from cortex-9.6.0/test/IECore/FileSequenceParameter.py rename to cortex-9.7.0/test/IECore/FileSequenceParameter.py diff --git a/cortex-9.6.0/test/IECore/FileSequenceVectorParameter.py b/cortex-9.7.0/test/IECore/FileSequenceVectorParameter.py similarity index 100% rename from cortex-9.6.0/test/IECore/FileSequenceVectorParameter.py rename to cortex-9.7.0/test/IECore/FileSequenceVectorParameter.py diff --git a/cortex-9.6.0/test/IECore/FontTest.py b/cortex-9.7.0/test/IECore/FontTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/FontTest.py rename to cortex-9.7.0/test/IECore/FontTest.py diff --git a/cortex-9.6.0/test/IECore/FormattedParameterHelp.py b/cortex-9.7.0/test/IECore/FormattedParameterHelp.py similarity index 100% rename from cortex-9.6.0/test/IECore/FormattedParameterHelp.py rename to cortex-9.7.0/test/IECore/FormattedParameterHelp.py diff --git a/cortex-9.6.0/test/IECore/FrameList.py b/cortex-9.7.0/test/IECore/FrameList.py similarity index 100% rename from cortex-9.6.0/test/IECore/FrameList.py rename to cortex-9.7.0/test/IECore/FrameList.py diff --git a/cortex-9.6.0/test/IECore/FrameListParameter.py b/cortex-9.7.0/test/IECore/FrameListParameter.py similarity index 100% rename from cortex-9.6.0/test/IECore/FrameListParameter.py rename to cortex-9.7.0/test/IECore/FrameListParameter.py diff --git a/cortex-9.6.0/test/IECore/GenericImageTest.py b/cortex-9.7.0/test/IECore/GenericImageTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/GenericImageTest.py rename to cortex-9.7.0/test/IECore/GenericImageTest.py diff --git a/cortex-9.6.0/test/IECore/GradeTest.py b/cortex-9.7.0/test/IECore/GradeTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/GradeTest.py rename to cortex-9.7.0/test/IECore/GradeTest.py diff --git a/cortex-9.6.0/test/IECore/Group.py b/cortex-9.7.0/test/IECore/Group.py similarity index 100% rename from cortex-9.6.0/test/IECore/Group.py rename to cortex-9.7.0/test/IECore/Group.py diff --git a/cortex-9.6.0/test/IECore/HeaderGenerator.py b/cortex-9.7.0/test/IECore/HeaderGenerator.py similarity index 100% rename from cortex-9.6.0/test/IECore/HeaderGenerator.py rename to cortex-9.7.0/test/IECore/HeaderGenerator.py diff --git a/cortex-9.6.0/test/IECore/HexConversionTest.py b/cortex-9.7.0/test/IECore/HexConversionTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/HexConversionTest.py rename to cortex-9.7.0/test/IECore/HexConversionTest.py diff --git a/cortex-9.6.0/test/IECore/IDXReaderTest.py b/cortex-9.7.0/test/IECore/IDXReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/IDXReaderTest.py rename to cortex-9.7.0/test/IECore/IDXReaderTest.py diff --git a/cortex-9.6.0/test/IECore/IECoreTest.cpp b/cortex-9.7.0/test/IECore/IECoreTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/IECoreTest.cpp rename to cortex-9.7.0/test/IECore/IECoreTest.cpp diff --git a/cortex-9.6.0/test/IECore/IgnoredExceptionsTest.py b/cortex-9.7.0/test/IECore/IgnoredExceptionsTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/IgnoredExceptionsTest.py rename to cortex-9.7.0/test/IECore/IgnoredExceptionsTest.py diff --git a/cortex-9.6.0/test/IECore/ImageCompositeOpTest.py b/cortex-9.7.0/test/IECore/ImageCompositeOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageCompositeOpTest.py rename to cortex-9.7.0/test/IECore/ImageCompositeOpTest.py diff --git a/cortex-9.6.0/test/IECore/ImageCropOp.py b/cortex-9.7.0/test/IECore/ImageCropOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageCropOp.py rename to cortex-9.7.0/test/IECore/ImageCropOp.py diff --git a/cortex-9.6.0/test/IECore/ImageDiffOp.py b/cortex-9.7.0/test/IECore/ImageDiffOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageDiffOp.py rename to cortex-9.7.0/test/IECore/ImageDiffOp.py diff --git a/cortex-9.6.0/test/IECore/ImagePremultiplyOpTest.py b/cortex-9.7.0/test/IECore/ImagePremultiplyOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImagePremultiplyOpTest.py rename to cortex-9.7.0/test/IECore/ImagePremultiplyOpTest.py diff --git a/cortex-9.6.0/test/IECore/ImagePrimitive.py b/cortex-9.7.0/test/IECore/ImagePrimitive.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImagePrimitive.py rename to cortex-9.7.0/test/IECore/ImagePrimitive.py diff --git a/cortex-9.6.0/test/IECore/ImagePrimitiveEvaluator.py b/cortex-9.7.0/test/IECore/ImagePrimitiveEvaluator.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImagePrimitiveEvaluator.py rename to cortex-9.7.0/test/IECore/ImagePrimitiveEvaluator.py diff --git a/cortex-9.6.0/test/IECore/ImageSequenceCompositeOpTest.py b/cortex-9.7.0/test/IECore/ImageSequenceCompositeOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageSequenceCompositeOpTest.py rename to cortex-9.7.0/test/IECore/ImageSequenceCompositeOpTest.py diff --git a/cortex-9.6.0/test/IECore/ImageTests.py b/cortex-9.7.0/test/IECore/ImageTests.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageTests.py rename to cortex-9.7.0/test/IECore/ImageTests.py diff --git a/cortex-9.6.0/test/IECore/ImageThinnerTest.py b/cortex-9.7.0/test/IECore/ImageThinnerTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageThinnerTest.py rename to cortex-9.7.0/test/IECore/ImageThinnerTest.py diff --git a/cortex-9.6.0/test/IECore/ImageUnpremultiplyOpTest.py b/cortex-9.7.0/test/IECore/ImageUnpremultiplyOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImageUnpremultiplyOpTest.py rename to cortex-9.7.0/test/IECore/ImageUnpremultiplyOpTest.py diff --git a/cortex-9.6.0/test/IECore/Imath.py b/cortex-9.7.0/test/IECore/Imath.py similarity index 100% rename from cortex-9.6.0/test/IECore/Imath.py rename to cortex-9.7.0/test/IECore/Imath.py diff --git a/cortex-9.6.0/test/IECore/ImathRootsTest.py b/cortex-9.7.0/test/IECore/ImathRootsTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImathRootsTest.py rename to cortex-9.7.0/test/IECore/ImathRootsTest.py diff --git a/cortex-9.6.0/test/IECore/ImathVectorData.py b/cortex-9.7.0/test/IECore/ImathVectorData.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImathVectorData.py rename to cortex-9.7.0/test/IECore/ImathVectorData.py diff --git a/cortex-9.6.0/test/IECore/ImfTest.py b/cortex-9.7.0/test/IECore/ImfTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ImfTest.py rename to cortex-9.7.0/test/IECore/ImfTest.py diff --git a/cortex-9.6.0/test/IECore/IndexedIO.py b/cortex-9.7.0/test/IECore/IndexedIO.py similarity index 100% rename from cortex-9.6.0/test/IECore/IndexedIO.py rename to cortex-9.7.0/test/IECore/IndexedIO.py diff --git a/cortex-9.6.0/test/IECore/IndexedIOTest.cpp b/cortex-9.7.0/test/IECore/IndexedIOTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/IndexedIOTest.cpp rename to cortex-9.7.0/test/IECore/IndexedIOTest.cpp diff --git a/cortex-9.6.0/test/IECore/IndexedIOTest.h b/cortex-9.7.0/test/IECore/IndexedIOTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/IndexedIOTest.h rename to cortex-9.7.0/test/IECore/IndexedIOTest.h diff --git a/cortex-9.6.0/test/IECore/InternedStringTest.cpp b/cortex-9.7.0/test/IECore/InternedStringTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/InternedStringTest.cpp rename to cortex-9.7.0/test/IECore/InternedStringTest.cpp diff --git a/cortex-9.6.0/test/IECore/InternedStringTest.h b/cortex-9.7.0/test/IECore/InternedStringTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/InternedStringTest.h rename to cortex-9.7.0/test/IECore/InternedStringTest.h diff --git a/cortex-9.6.0/test/IECore/InternedStringTest.py b/cortex-9.7.0/test/IECore/InternedStringTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/InternedStringTest.py rename to cortex-9.7.0/test/IECore/InternedStringTest.py diff --git a/cortex-9.6.0/test/IECore/InterpolatorTest.cpp b/cortex-9.7.0/test/IECore/InterpolatorTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/InterpolatorTest.cpp rename to cortex-9.7.0/test/IECore/InterpolatorTest.cpp diff --git a/cortex-9.6.0/test/IECore/InterpolatorTest.h b/cortex-9.7.0/test/IECore/InterpolatorTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/InterpolatorTest.h rename to cortex-9.7.0/test/IECore/InterpolatorTest.h diff --git a/cortex-9.6.0/test/IECore/InterpolatorTest.inl b/cortex-9.7.0/test/IECore/InterpolatorTest.inl similarity index 100% rename from cortex-9.6.0/test/IECore/InterpolatorTest.inl rename to cortex-9.7.0/test/IECore/InterpolatorTest.inl diff --git a/cortex-9.6.0/test/IECore/InverseDistanceWeightedInterpolation.py b/cortex-9.7.0/test/IECore/InverseDistanceWeightedInterpolation.py similarity index 100% rename from cortex-9.6.0/test/IECore/InverseDistanceWeightedInterpolation.py rename to cortex-9.7.0/test/IECore/InverseDistanceWeightedInterpolation.py diff --git a/cortex-9.6.0/test/IECore/JPEGImageReader.py b/cortex-9.7.0/test/IECore/JPEGImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/JPEGImageReader.py rename to cortex-9.7.0/test/IECore/JPEGImageReader.py diff --git a/cortex-9.6.0/test/IECore/JPEGImageWriter.py b/cortex-9.7.0/test/IECore/JPEGImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/JPEGImageWriter.py rename to cortex-9.7.0/test/IECore/JPEGImageWriter.py diff --git a/cortex-9.6.0/test/IECore/KDTree.py b/cortex-9.7.0/test/IECore/KDTree.py similarity index 100% rename from cortex-9.6.0/test/IECore/KDTree.py rename to cortex-9.7.0/test/IECore/KDTree.py diff --git a/cortex-9.6.0/test/IECore/KDTreeTest.cpp b/cortex-9.7.0/test/IECore/KDTreeTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/KDTreeTest.cpp rename to cortex-9.7.0/test/IECore/KDTreeTest.cpp diff --git a/cortex-9.6.0/test/IECore/KDTreeTest.h b/cortex-9.7.0/test/IECore/KDTreeTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/KDTreeTest.h rename to cortex-9.7.0/test/IECore/KDTreeTest.h diff --git a/cortex-9.6.0/test/IECore/KDTreeTest.inl b/cortex-9.7.0/test/IECore/KDTreeTest.inl similarity index 100% rename from cortex-9.6.0/test/IECore/KDTreeTest.inl rename to cortex-9.7.0/test/IECore/KDTreeTest.inl diff --git a/cortex-9.6.0/test/IECore/LRUCacheTest.py b/cortex-9.7.0/test/IECore/LRUCacheTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LRUCacheTest.py rename to cortex-9.7.0/test/IECore/LRUCacheTest.py diff --git a/cortex-9.6.0/test/IECore/LRUCacheThreadingTest.cpp b/cortex-9.7.0/test/IECore/LRUCacheThreadingTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/LRUCacheThreadingTest.cpp rename to cortex-9.7.0/test/IECore/LRUCacheThreadingTest.cpp diff --git a/cortex-9.6.0/test/IECore/LRUCacheThreadingTest.h b/cortex-9.7.0/test/IECore/LRUCacheThreadingTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/LRUCacheThreadingTest.h rename to cortex-9.7.0/test/IECore/LRUCacheThreadingTest.h diff --git a/cortex-9.6.0/test/IECore/LayeredDictTest.py b/cortex-9.7.0/test/IECore/LayeredDictTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LayeredDictTest.py rename to cortex-9.7.0/test/IECore/LayeredDictTest.py diff --git a/cortex-9.6.0/test/IECore/LensDistortOpTest.py b/cortex-9.7.0/test/IECore/LensDistortOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LensDistortOpTest.py rename to cortex-9.7.0/test/IECore/LensDistortOpTest.py diff --git a/cortex-9.6.0/test/IECore/LevenbergMarquardtTest.cpp b/cortex-9.7.0/test/IECore/LevenbergMarquardtTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/LevenbergMarquardtTest.cpp rename to cortex-9.7.0/test/IECore/LevenbergMarquardtTest.cpp diff --git a/cortex-9.6.0/test/IECore/LevenbergMarquardtTest.h b/cortex-9.7.0/test/IECore/LevenbergMarquardtTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/LevenbergMarquardtTest.h rename to cortex-9.7.0/test/IECore/LevenbergMarquardtTest.h diff --git a/cortex-9.6.0/test/IECore/LevenbergMarquardtTest.inl b/cortex-9.7.0/test/IECore/LevenbergMarquardtTest.inl similarity index 100% rename from cortex-9.6.0/test/IECore/LevenbergMarquardtTest.inl rename to cortex-9.7.0/test/IECore/LevenbergMarquardtTest.inl diff --git a/cortex-9.6.0/test/IECore/LevenbergMarquardtTest.py b/cortex-9.7.0/test/IECore/LevenbergMarquardtTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LevenbergMarquardtTest.py rename to cortex-9.7.0/test/IECore/LevenbergMarquardtTest.py diff --git a/cortex-9.6.0/test/IECore/LightTest.py b/cortex-9.7.0/test/IECore/LightTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LightTest.py rename to cortex-9.7.0/test/IECore/LightTest.py diff --git a/cortex-9.6.0/test/IECore/LimitSmoothSkinningInfluencesOpTest.py b/cortex-9.7.0/test/IECore/LimitSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LimitSmoothSkinningInfluencesOpTest.py rename to cortex-9.7.0/test/IECore/LimitSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.6.0/test/IECore/LineSegmentTest.py b/cortex-9.7.0/test/IECore/LineSegmentTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LineSegmentTest.py rename to cortex-9.7.0/test/IECore/LineSegmentTest.py diff --git a/cortex-9.6.0/test/IECore/LinkedSceneTest.py b/cortex-9.7.0/test/IECore/LinkedSceneTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LinkedSceneTest.py rename to cortex-9.7.0/test/IECore/LinkedSceneTest.py diff --git a/cortex-9.6.0/test/IECore/LookupTest.cpp b/cortex-9.7.0/test/IECore/LookupTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/LookupTest.cpp rename to cortex-9.7.0/test/IECore/LookupTest.cpp diff --git a/cortex-9.6.0/test/IECore/LookupTest.h b/cortex-9.7.0/test/IECore/LookupTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/LookupTest.h rename to cortex-9.7.0/test/IECore/LookupTest.h diff --git a/cortex-9.6.0/test/IECore/LookupTest.py b/cortex-9.7.0/test/IECore/LookupTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LookupTest.py rename to cortex-9.7.0/test/IECore/LookupTest.py diff --git a/cortex-9.6.0/test/IECore/LuminanceOpTest.py b/cortex-9.7.0/test/IECore/LuminanceOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/LuminanceOpTest.py rename to cortex-9.7.0/test/IECore/LuminanceOpTest.py diff --git a/cortex-9.6.0/test/IECore/Math.py b/cortex-9.7.0/test/IECore/Math.py similarity index 100% rename from cortex-9.6.0/test/IECore/Math.py rename to cortex-9.7.0/test/IECore/Math.py diff --git a/cortex-9.6.0/test/IECore/MatrixMultiplyOp.py b/cortex-9.7.0/test/IECore/MatrixMultiplyOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/MatrixMultiplyOp.py rename to cortex-9.7.0/test/IECore/MatrixMultiplyOp.py diff --git a/cortex-9.6.0/test/IECore/MedianCutSamplerTest.py b/cortex-9.7.0/test/IECore/MedianCutSamplerTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MedianCutSamplerTest.py rename to cortex-9.7.0/test/IECore/MedianCutSamplerTest.py diff --git a/cortex-9.6.0/test/IECore/MemoryUsage.py b/cortex-9.7.0/test/IECore/MemoryUsage.py similarity index 100% rename from cortex-9.6.0/test/IECore/MemoryUsage.py rename to cortex-9.7.0/test/IECore/MemoryUsage.py diff --git a/cortex-9.6.0/test/IECore/Menus.py b/cortex-9.7.0/test/IECore/Menus.py similarity index 100% rename from cortex-9.6.0/test/IECore/Menus.py rename to cortex-9.7.0/test/IECore/Menus.py diff --git a/cortex-9.6.0/test/IECore/MeshDistortionsOpTest.py b/cortex-9.7.0/test/IECore/MeshDistortionsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshDistortionsOpTest.py rename to cortex-9.7.0/test/IECore/MeshDistortionsOpTest.py diff --git a/cortex-9.6.0/test/IECore/MeshFaceFilterOpTest.py b/cortex-9.7.0/test/IECore/MeshFaceFilterOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshFaceFilterOpTest.py rename to cortex-9.7.0/test/IECore/MeshFaceFilterOpTest.py diff --git a/cortex-9.6.0/test/IECore/MeshMergeOpTest.py b/cortex-9.7.0/test/IECore/MeshMergeOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshMergeOpTest.py rename to cortex-9.7.0/test/IECore/MeshMergeOpTest.py diff --git a/cortex-9.6.0/test/IECore/MeshNormalsOpTest.py b/cortex-9.7.0/test/IECore/MeshNormalsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshNormalsOpTest.py rename to cortex-9.7.0/test/IECore/MeshNormalsOpTest.py diff --git a/cortex-9.6.0/test/IECore/MeshPrimitive.py b/cortex-9.7.0/test/IECore/MeshPrimitive.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshPrimitive.py rename to cortex-9.7.0/test/IECore/MeshPrimitive.py diff --git a/cortex-9.6.0/test/IECore/MeshPrimitiveEvaluator.py b/cortex-9.7.0/test/IECore/MeshPrimitiveEvaluator.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshPrimitiveEvaluator.py rename to cortex-9.7.0/test/IECore/MeshPrimitiveEvaluator.py diff --git a/cortex-9.6.0/test/IECore/MeshPrimitiveShrinkWrapOp.py b/cortex-9.7.0/test/IECore/MeshPrimitiveShrinkWrapOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshPrimitiveShrinkWrapOp.py rename to cortex-9.7.0/test/IECore/MeshPrimitiveShrinkWrapOp.py diff --git a/cortex-9.6.0/test/IECore/MeshTangentsOpTest.py b/cortex-9.7.0/test/IECore/MeshTangentsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshTangentsOpTest.py rename to cortex-9.7.0/test/IECore/MeshTangentsOpTest.py diff --git a/cortex-9.6.0/test/IECore/MeshVertexReorderOpTest.py b/cortex-9.7.0/test/IECore/MeshVertexReorderOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MeshVertexReorderOpTest.py rename to cortex-9.7.0/test/IECore/MeshVertexReorderOpTest.py diff --git a/cortex-9.6.0/test/IECore/MessageHandler.py b/cortex-9.7.0/test/IECore/MessageHandler.py similarity index 100% rename from cortex-9.6.0/test/IECore/MessageHandler.py rename to cortex-9.7.0/test/IECore/MessageHandler.py diff --git a/cortex-9.6.0/test/IECore/MixSmoothSkinningWeightsOpTest.py b/cortex-9.7.0/test/IECore/MixSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MixSmoothSkinningWeightsOpTest.py rename to cortex-9.7.0/test/IECore/MixSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.6.0/test/IECore/MotionPrimitive.py b/cortex-9.7.0/test/IECore/MotionPrimitive.py similarity index 100% rename from cortex-9.6.0/test/IECore/MotionPrimitive.py rename to cortex-9.7.0/test/IECore/MotionPrimitive.py diff --git a/cortex-9.6.0/test/IECore/MurmurHashTest.py b/cortex-9.7.0/test/IECore/MurmurHashTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/MurmurHashTest.py rename to cortex-9.7.0/test/IECore/MurmurHashTest.py diff --git a/cortex-9.6.0/test/IECore/NParticleReader.py b/cortex-9.7.0/test/IECore/NParticleReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/NParticleReader.py rename to cortex-9.7.0/test/IECore/NParticleReader.py diff --git a/cortex-9.6.0/test/IECore/NURBS.py b/cortex-9.7.0/test/IECore/NURBS.py similarity index 100% rename from cortex-9.6.0/test/IECore/NURBS.py rename to cortex-9.7.0/test/IECore/NURBS.py diff --git a/cortex-9.6.0/test/IECore/NamespacePollution.py b/cortex-9.7.0/test/IECore/NamespacePollution.py similarity index 100% rename from cortex-9.6.0/test/IECore/NamespacePollution.py rename to cortex-9.7.0/test/IECore/NamespacePollution.py diff --git a/cortex-9.6.0/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py b/cortex-9.7.0/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py rename to cortex-9.7.0/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.6.0/test/IECore/NullObjectTest.py b/cortex-9.7.0/test/IECore/NullObjectTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/NullObjectTest.py rename to cortex-9.7.0/test/IECore/NullObjectTest.py diff --git a/cortex-9.6.0/test/IECore/OBJReaderTest.py b/cortex-9.7.0/test/IECore/OBJReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/OBJReaderTest.py rename to cortex-9.7.0/test/IECore/OBJReaderTest.py diff --git a/cortex-9.6.0/test/IECore/Object.py b/cortex-9.7.0/test/IECore/Object.py similarity index 100% rename from cortex-9.6.0/test/IECore/Object.py rename to cortex-9.7.0/test/IECore/Object.py diff --git a/cortex-9.6.0/test/IECore/ObjectIO.py b/cortex-9.7.0/test/IECore/ObjectIO.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectIO.py rename to cortex-9.7.0/test/IECore/ObjectIO.py diff --git a/cortex-9.6.0/test/IECore/ObjectInterpolation.py b/cortex-9.7.0/test/IECore/ObjectInterpolation.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectInterpolation.py rename to cortex-9.7.0/test/IECore/ObjectInterpolation.py diff --git a/cortex-9.6.0/test/IECore/ObjectPoolTest.py b/cortex-9.7.0/test/IECore/ObjectPoolTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectPoolTest.py rename to cortex-9.7.0/test/IECore/ObjectPoolTest.py diff --git a/cortex-9.6.0/test/IECore/ObjectReader.py b/cortex-9.7.0/test/IECore/ObjectReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectReader.py rename to cortex-9.7.0/test/IECore/ObjectReader.py diff --git a/cortex-9.6.0/test/IECore/ObjectVectorTest.py b/cortex-9.7.0/test/IECore/ObjectVectorTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectVectorTest.py rename to cortex-9.7.0/test/IECore/ObjectVectorTest.py diff --git a/cortex-9.6.0/test/IECore/ObjectWriter.py b/cortex-9.7.0/test/IECore/ObjectWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/ObjectWriter.py rename to cortex-9.7.0/test/IECore/ObjectWriter.py diff --git a/cortex-9.6.0/test/IECore/Op.py b/cortex-9.7.0/test/IECore/Op.py similarity index 100% rename from cortex-9.6.0/test/IECore/Op.py rename to cortex-9.7.0/test/IECore/Op.py diff --git a/cortex-9.6.0/test/IECore/OptionalCompoundParameter.py b/cortex-9.7.0/test/IECore/OptionalCompoundParameter.py similarity index 100% rename from cortex-9.6.0/test/IECore/OptionalCompoundParameter.py rename to cortex-9.7.0/test/IECore/OptionalCompoundParameter.py diff --git a/cortex-9.6.0/test/IECore/OptionsTest.py b/cortex-9.7.0/test/IECore/OptionsTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/OptionsTest.py rename to cortex-9.7.0/test/IECore/OptionsTest.py diff --git a/cortex-9.6.0/test/IECore/OversamplesCalculatorTest.py b/cortex-9.7.0/test/IECore/OversamplesCalculatorTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/OversamplesCalculatorTest.py rename to cortex-9.7.0/test/IECore/OversamplesCalculatorTest.py diff --git a/cortex-9.6.0/test/IECore/PDCReader.py b/cortex-9.7.0/test/IECore/PDCReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/PDCReader.py rename to cortex-9.7.0/test/IECore/PDCReader.py diff --git a/cortex-9.6.0/test/IECore/PDCWriter.py b/cortex-9.7.0/test/IECore/PDCWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/PDCWriter.py rename to cortex-9.7.0/test/IECore/PDCWriter.py diff --git a/cortex-9.6.0/test/IECore/PNGImageReader.py b/cortex-9.7.0/test/IECore/PNGImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/PNGImageReader.py rename to cortex-9.7.0/test/IECore/PNGImageReader.py diff --git a/cortex-9.6.0/test/IECore/ParameterAlgoTest.py b/cortex-9.7.0/test/IECore/ParameterAlgoTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ParameterAlgoTest.py rename to cortex-9.7.0/test/IECore/ParameterAlgoTest.py diff --git a/cortex-9.6.0/test/IECore/ParameterParser.py b/cortex-9.7.0/test/IECore/ParameterParser.py similarity index 100% rename from cortex-9.6.0/test/IECore/ParameterParser.py rename to cortex-9.7.0/test/IECore/ParameterParser.py diff --git a/cortex-9.6.0/test/IECore/ParameterThreadingTest.cpp b/cortex-9.7.0/test/IECore/ParameterThreadingTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/ParameterThreadingTest.cpp rename to cortex-9.7.0/test/IECore/ParameterThreadingTest.cpp diff --git a/cortex-9.6.0/test/IECore/ParameterThreadingTest.h b/cortex-9.7.0/test/IECore/ParameterThreadingTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/ParameterThreadingTest.h rename to cortex-9.7.0/test/IECore/ParameterThreadingTest.h diff --git a/cortex-9.6.0/test/IECore/Parameterised.py b/cortex-9.7.0/test/IECore/Parameterised.py similarity index 100% rename from cortex-9.6.0/test/IECore/Parameterised.py rename to cortex-9.7.0/test/IECore/Parameterised.py diff --git a/cortex-9.6.0/test/IECore/ParameterisedProceduralTest.py b/cortex-9.7.0/test/IECore/ParameterisedProceduralTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ParameterisedProceduralTest.py rename to cortex-9.7.0/test/IECore/ParameterisedProceduralTest.py diff --git a/cortex-9.6.0/test/IECore/Parameters.py b/cortex-9.7.0/test/IECore/Parameters.py similarity index 100% rename from cortex-9.6.0/test/IECore/Parameters.py rename to cortex-9.7.0/test/IECore/Parameters.py diff --git a/cortex-9.6.0/test/IECore/PatchMeshPrimitiveTest.py b/cortex-9.7.0/test/IECore/PatchMeshPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PatchMeshPrimitiveTest.py rename to cortex-9.7.0/test/IECore/PatchMeshPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECore/PerlinNoise.py b/cortex-9.7.0/test/IECore/PerlinNoise.py similarity index 100% rename from cortex-9.6.0/test/IECore/PerlinNoise.py rename to cortex-9.7.0/test/IECore/PerlinNoise.py diff --git a/cortex-9.6.0/test/IECore/PointBoundsOp.py b/cortex-9.7.0/test/IECore/PointBoundsOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointBoundsOp.py rename to cortex-9.7.0/test/IECore/PointBoundsOp.py diff --git a/cortex-9.6.0/test/IECore/PointDistributionOpTest.py b/cortex-9.7.0/test/IECore/PointDistributionOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointDistributionOpTest.py rename to cortex-9.7.0/test/IECore/PointDistributionOpTest.py diff --git a/cortex-9.6.0/test/IECore/PointDistributionTest.py b/cortex-9.7.0/test/IECore/PointDistributionTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointDistributionTest.py rename to cortex-9.7.0/test/IECore/PointDistributionTest.py diff --git a/cortex-9.6.0/test/IECore/PointSmoothSkinningOpTest.py b/cortex-9.7.0/test/IECore/PointSmoothSkinningOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointSmoothSkinningOpTest.py rename to cortex-9.7.0/test/IECore/PointSmoothSkinningOpTest.py diff --git a/cortex-9.6.0/test/IECore/PointVelocityDisplaceOp.py b/cortex-9.7.0/test/IECore/PointVelocityDisplaceOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointVelocityDisplaceOp.py rename to cortex-9.7.0/test/IECore/PointVelocityDisplaceOp.py diff --git a/cortex-9.6.0/test/IECore/PointsExpressionOp.py b/cortex-9.7.0/test/IECore/PointsExpressionOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointsExpressionOp.py rename to cortex-9.7.0/test/IECore/PointsExpressionOp.py diff --git a/cortex-9.6.0/test/IECore/PointsMotionOpTest.py b/cortex-9.7.0/test/IECore/PointsMotionOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointsMotionOpTest.py rename to cortex-9.7.0/test/IECore/PointsMotionOpTest.py diff --git a/cortex-9.6.0/test/IECore/PointsPrimitive.py b/cortex-9.7.0/test/IECore/PointsPrimitive.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointsPrimitive.py rename to cortex-9.7.0/test/IECore/PointsPrimitive.py diff --git a/cortex-9.6.0/test/IECore/PointsPrimitiveEvaluatorTest.py b/cortex-9.7.0/test/IECore/PointsPrimitiveEvaluatorTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PointsPrimitiveEvaluatorTest.py rename to cortex-9.7.0/test/IECore/PointsPrimitiveEvaluatorTest.py diff --git a/cortex-9.6.0/test/IECore/PolygonAlgoTest.py b/cortex-9.7.0/test/IECore/PolygonAlgoTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PolygonAlgoTest.py rename to cortex-9.7.0/test/IECore/PolygonAlgoTest.py diff --git a/cortex-9.6.0/test/IECore/PrimitiveEvaluator.py b/cortex-9.7.0/test/IECore/PrimitiveEvaluator.py similarity index 100% rename from cortex-9.6.0/test/IECore/PrimitiveEvaluator.py rename to cortex-9.7.0/test/IECore/PrimitiveEvaluator.py diff --git a/cortex-9.6.0/test/IECore/PrimitiveTest.py b/cortex-9.7.0/test/IECore/PrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PrimitiveTest.py rename to cortex-9.7.0/test/IECore/PrimitiveTest.py diff --git a/cortex-9.6.0/test/IECore/PrimitiveVariableTest.py b/cortex-9.7.0/test/IECore/PrimitiveVariableTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/PrimitiveVariableTest.py rename to cortex-9.7.0/test/IECore/PrimitiveVariableTest.py diff --git a/cortex-9.6.0/test/IECore/RadixSortTest.cpp b/cortex-9.7.0/test/IECore/RadixSortTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/RadixSortTest.cpp rename to cortex-9.7.0/test/IECore/RadixSortTest.cpp diff --git a/cortex-9.6.0/test/IECore/RadixSortTest.h b/cortex-9.7.0/test/IECore/RadixSortTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/RadixSortTest.h rename to cortex-9.7.0/test/IECore/RadixSortTest.h diff --git a/cortex-9.6.0/test/IECore/RadixSortTest.py b/cortex-9.7.0/test/IECore/RadixSortTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/RadixSortTest.py rename to cortex-9.7.0/test/IECore/RadixSortTest.py diff --git a/cortex-9.6.0/test/IECore/RandomTest.py b/cortex-9.7.0/test/IECore/RandomTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/RandomTest.py rename to cortex-9.7.0/test/IECore/RandomTest.py diff --git a/cortex-9.6.0/test/IECore/Reader.py b/cortex-9.7.0/test/IECore/Reader.py similarity index 100% rename from cortex-9.6.0/test/IECore/Reader.py rename to cortex-9.7.0/test/IECore/Reader.py diff --git a/cortex-9.6.0/test/IECore/RefCountedTest.py b/cortex-9.7.0/test/IECore/RefCountedTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/RefCountedTest.py rename to cortex-9.7.0/test/IECore/RefCountedTest.py diff --git a/cortex-9.6.0/test/IECore/RefCountedThreadingTest.cpp b/cortex-9.7.0/test/IECore/RefCountedThreadingTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/RefCountedThreadingTest.cpp rename to cortex-9.7.0/test/IECore/RefCountedThreadingTest.cpp diff --git a/cortex-9.6.0/test/IECore/RefCountedThreadingTest.h b/cortex-9.7.0/test/IECore/RefCountedThreadingTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/RefCountedThreadingTest.h rename to cortex-9.7.0/test/IECore/RefCountedThreadingTest.h diff --git a/cortex-9.6.0/test/IECore/RelativePreset.py b/cortex-9.7.0/test/IECore/RelativePreset.py similarity index 100% rename from cortex-9.6.0/test/IECore/RelativePreset.py rename to cortex-9.7.0/test/IECore/RelativePreset.py diff --git a/cortex-9.6.0/test/IECore/RemovePrimitiveVariables.py b/cortex-9.7.0/test/IECore/RemovePrimitiveVariables.py similarity index 100% rename from cortex-9.6.0/test/IECore/RemovePrimitiveVariables.py rename to cortex-9.7.0/test/IECore/RemovePrimitiveVariables.py diff --git a/cortex-9.6.0/test/IECore/RenamePrimitiveVariables.py b/cortex-9.7.0/test/IECore/RenamePrimitiveVariables.py similarity index 100% rename from cortex-9.6.0/test/IECore/RenamePrimitiveVariables.py rename to cortex-9.7.0/test/IECore/RenamePrimitiveVariables.py diff --git a/cortex-9.6.0/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py b/cortex-9.7.0/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py rename to cortex-9.7.0/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.6.0/test/IECore/ReversedFrameList.py b/cortex-9.7.0/test/IECore/ReversedFrameList.py similarity index 100% rename from cortex-9.6.0/test/IECore/ReversedFrameList.py rename to cortex-9.7.0/test/IECore/ReversedFrameList.py diff --git a/cortex-9.6.0/test/IECore/RunTimeTyped.py b/cortex-9.7.0/test/IECore/RunTimeTyped.py similarity index 100% rename from cortex-9.6.0/test/IECore/RunTimeTyped.py rename to cortex-9.7.0/test/IECore/RunTimeTyped.py diff --git a/cortex-9.6.0/test/IECore/SGIImageReaderTest.py b/cortex-9.7.0/test/IECore/SGIImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SGIImageReaderTest.py rename to cortex-9.7.0/test/IECore/SGIImageReaderTest.py diff --git a/cortex-9.6.0/test/IECore/SWAReaderTest.py b/cortex-9.7.0/test/IECore/SWAReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SWAReaderTest.py rename to cortex-9.7.0/test/IECore/SWAReaderTest.py diff --git a/cortex-9.6.0/test/IECore/SceneCacheTest.py b/cortex-9.7.0/test/IECore/SceneCacheTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SceneCacheTest.py rename to cortex-9.7.0/test/IECore/SceneCacheTest.py diff --git a/cortex-9.6.0/test/IECore/SceneCacheThreadingTest.cpp b/cortex-9.7.0/test/IECore/SceneCacheThreadingTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/SceneCacheThreadingTest.cpp rename to cortex-9.7.0/test/IECore/SceneCacheThreadingTest.cpp diff --git a/cortex-9.6.0/test/IECore/SceneCacheThreadingTest.h b/cortex-9.7.0/test/IECore/SceneCacheThreadingTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/SceneCacheThreadingTest.h rename to cortex-9.7.0/test/IECore/SceneCacheThreadingTest.h diff --git a/cortex-9.6.0/test/IECore/SceneInterfaceTest.py b/cortex-9.7.0/test/IECore/SceneInterfaceTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SceneInterfaceTest.py rename to cortex-9.7.0/test/IECore/SceneInterfaceTest.py diff --git a/cortex-9.6.0/test/IECore/SearchPath.py b/cortex-9.7.0/test/IECore/SearchPath.py similarity index 100% rename from cortex-9.6.0/test/IECore/SearchPath.py rename to cortex-9.7.0/test/IECore/SearchPath.py diff --git a/cortex-9.6.0/test/IECore/SearchReplaceOp.py b/cortex-9.7.0/test/IECore/SearchReplaceOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/SearchReplaceOp.py rename to cortex-9.7.0/test/IECore/SearchReplaceOp.py diff --git a/cortex-9.6.0/test/IECore/SequenceLsOpTest.py b/cortex-9.7.0/test/IECore/SequenceLsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SequenceLsOpTest.py rename to cortex-9.7.0/test/IECore/SequenceLsOpTest.py diff --git a/cortex-9.6.0/test/IECore/Shader.py b/cortex-9.7.0/test/IECore/Shader.py similarity index 100% rename from cortex-9.6.0/test/IECore/Shader.py rename to cortex-9.7.0/test/IECore/Shader.py diff --git a/cortex-9.6.0/test/IECore/SimpleTypedData.py b/cortex-9.7.0/test/IECore/SimpleTypedData.py similarity index 100% rename from cortex-9.6.0/test/IECore/SimpleTypedData.py rename to cortex-9.7.0/test/IECore/SimpleTypedData.py diff --git a/cortex-9.6.0/test/IECore/SmoothSkinningDataTest.py b/cortex-9.7.0/test/IECore/SmoothSkinningDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SmoothSkinningDataTest.py rename to cortex-9.7.0/test/IECore/SmoothSkinningDataTest.py diff --git a/cortex-9.6.0/test/IECore/SmoothSmoothSkinningWeightsOpTest.py b/cortex-9.7.0/test/IECore/SmoothSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SmoothSmoothSkinningWeightsOpTest.py rename to cortex-9.7.0/test/IECore/SmoothSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.6.0/test/IECore/SpaceTransformTest.cpp b/cortex-9.7.0/test/IECore/SpaceTransformTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/SpaceTransformTest.cpp rename to cortex-9.7.0/test/IECore/SpaceTransformTest.cpp diff --git a/cortex-9.6.0/test/IECore/SpaceTransformTest.h b/cortex-9.7.0/test/IECore/SpaceTransformTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/SpaceTransformTest.h rename to cortex-9.7.0/test/IECore/SpaceTransformTest.h diff --git a/cortex-9.6.0/test/IECore/SpherePrimitiveEvaluator.py b/cortex-9.7.0/test/IECore/SpherePrimitiveEvaluator.py similarity index 100% rename from cortex-9.6.0/test/IECore/SpherePrimitiveEvaluator.py rename to cortex-9.7.0/test/IECore/SpherePrimitiveEvaluator.py diff --git a/cortex-9.6.0/test/IECore/SplineDataTest.py b/cortex-9.7.0/test/IECore/SplineDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SplineDataTest.py rename to cortex-9.7.0/test/IECore/SplineDataTest.py diff --git a/cortex-9.6.0/test/IECore/SplineParameterTest.py b/cortex-9.7.0/test/IECore/SplineParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SplineParameterTest.py rename to cortex-9.7.0/test/IECore/SplineParameterTest.py diff --git a/cortex-9.6.0/test/IECore/SplineTest.py b/cortex-9.7.0/test/IECore/SplineTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SplineTest.py rename to cortex-9.7.0/test/IECore/SplineTest.py diff --git a/cortex-9.6.0/test/IECore/SplineToImageTest.py b/cortex-9.7.0/test/IECore/SplineToImageTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SplineToImageTest.py rename to cortex-9.7.0/test/IECore/SplineToImageTest.py diff --git a/cortex-9.6.0/test/IECore/StandardRadialLensModelTest.py b/cortex-9.7.0/test/IECore/StandardRadialLensModelTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/StandardRadialLensModelTest.py rename to cortex-9.7.0/test/IECore/StandardRadialLensModelTest.py diff --git a/cortex-9.6.0/test/IECore/StringAlgoTest.cpp b/cortex-9.7.0/test/IECore/StringAlgoTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/StringAlgoTest.cpp rename to cortex-9.7.0/test/IECore/StringAlgoTest.cpp diff --git a/cortex-9.6.0/test/IECore/StringAlgoTest.h b/cortex-9.7.0/test/IECore/StringAlgoTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/StringAlgoTest.h rename to cortex-9.7.0/test/IECore/StringAlgoTest.h diff --git a/cortex-9.6.0/test/IECore/StringUtilTest.py b/cortex-9.7.0/test/IECore/StringUtilTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/StringUtilTest.py rename to cortex-9.7.0/test/IECore/StringUtilTest.py diff --git a/cortex-9.6.0/test/IECore/Struct.py b/cortex-9.7.0/test/IECore/Struct.py similarity index 100% rename from cortex-9.6.0/test/IECore/Struct.py rename to cortex-9.7.0/test/IECore/Struct.py diff --git a/cortex-9.6.0/test/IECore/SubstitutedDictTest.py b/cortex-9.7.0/test/IECore/SubstitutedDictTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SubstitutedDictTest.py rename to cortex-9.7.0/test/IECore/SubstitutedDictTest.py diff --git a/cortex-9.6.0/test/IECore/SummedAreaOpTest.py b/cortex-9.7.0/test/IECore/SummedAreaOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/SummedAreaOpTest.py rename to cortex-9.7.0/test/IECore/SummedAreaOpTest.py diff --git a/cortex-9.6.0/test/IECore/SweepAndPruneTest.cpp b/cortex-9.7.0/test/IECore/SweepAndPruneTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/SweepAndPruneTest.cpp rename to cortex-9.7.0/test/IECore/SweepAndPruneTest.cpp diff --git a/cortex-9.6.0/test/IECore/SweepAndPruneTest.h b/cortex-9.7.0/test/IECore/SweepAndPruneTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/SweepAndPruneTest.h rename to cortex-9.7.0/test/IECore/SweepAndPruneTest.h diff --git a/cortex-9.6.0/test/IECore/TGAImageReaderTest.py b/cortex-9.7.0/test/IECore/TGAImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TGAImageReaderTest.py rename to cortex-9.7.0/test/IECore/TGAImageReaderTest.py diff --git a/cortex-9.6.0/test/IECore/TGAImageWriterTest.py b/cortex-9.7.0/test/IECore/TGAImageWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TGAImageWriterTest.py rename to cortex-9.7.0/test/IECore/TGAImageWriterTest.py diff --git a/cortex-9.6.0/test/IECore/TIFFImageReader.py b/cortex-9.7.0/test/IECore/TIFFImageReader.py similarity index 100% rename from cortex-9.6.0/test/IECore/TIFFImageReader.py rename to cortex-9.7.0/test/IECore/TIFFImageReader.py diff --git a/cortex-9.6.0/test/IECore/TIFFImageWriter.py b/cortex-9.7.0/test/IECore/TIFFImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/TIFFImageWriter.py rename to cortex-9.7.0/test/IECore/TIFFImageWriter.py diff --git a/cortex-9.6.0/test/IECore/ThreadingTest.py b/cortex-9.7.0/test/IECore/ThreadingTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/ThreadingTest.py rename to cortex-9.7.0/test/IECore/ThreadingTest.py diff --git a/cortex-9.6.0/test/IECore/TimeCodeDataTest.py b/cortex-9.7.0/test/IECore/TimeCodeDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TimeCodeDataTest.py rename to cortex-9.7.0/test/IECore/TimeCodeDataTest.py diff --git a/cortex-9.6.0/test/IECore/TimeCodeParameterTest.py b/cortex-9.7.0/test/IECore/TimeCodeParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TimeCodeParameterTest.py rename to cortex-9.7.0/test/IECore/TimeCodeParameterTest.py diff --git a/cortex-9.6.0/test/IECore/TimeDurationDataTest.py b/cortex-9.7.0/test/IECore/TimeDurationDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TimeDurationDataTest.py rename to cortex-9.7.0/test/IECore/TimeDurationDataTest.py diff --git a/cortex-9.6.0/test/IECore/TimePeriodDataTest.py b/cortex-9.7.0/test/IECore/TimePeriodDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TimePeriodDataTest.py rename to cortex-9.7.0/test/IECore/TimePeriodDataTest.py diff --git a/cortex-9.6.0/test/IECore/TransferSmoothSkinningWeightsOpTest.py b/cortex-9.7.0/test/IECore/TransferSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TransferSmoothSkinningWeightsOpTest.py rename to cortex-9.7.0/test/IECore/TransferSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.6.0/test/IECore/Transform.py b/cortex-9.7.0/test/IECore/Transform.py similarity index 100% rename from cortex-9.6.0/test/IECore/Transform.py rename to cortex-9.7.0/test/IECore/Transform.py diff --git a/cortex-9.6.0/test/IECore/TransformOpTest.py b/cortex-9.7.0/test/IECore/TransformOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TransformOpTest.py rename to cortex-9.7.0/test/IECore/TransformOpTest.py diff --git a/cortex-9.6.0/test/IECore/TransformationMatrixData.py b/cortex-9.7.0/test/IECore/TransformationMatrixData.py similarity index 100% rename from cortex-9.6.0/test/IECore/TransformationMatrixData.py rename to cortex-9.7.0/test/IECore/TransformationMatrixData.py diff --git a/cortex-9.6.0/test/IECore/TriangleAlgoTest.py b/cortex-9.7.0/test/IECore/TriangleAlgoTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TriangleAlgoTest.py rename to cortex-9.7.0/test/IECore/TriangleAlgoTest.py diff --git a/cortex-9.6.0/test/IECore/TriangulateOp.py b/cortex-9.7.0/test/IECore/TriangulateOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/TriangulateOp.py rename to cortex-9.7.0/test/IECore/TriangulateOp.py diff --git a/cortex-9.6.0/test/IECore/TriangulatorTest.py b/cortex-9.7.0/test/IECore/TriangulatorTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TriangulatorTest.py rename to cortex-9.7.0/test/IECore/TriangulatorTest.py diff --git a/cortex-9.6.0/test/IECore/Turbulence.py b/cortex-9.7.0/test/IECore/Turbulence.py similarity index 100% rename from cortex-9.6.0/test/IECore/Turbulence.py rename to cortex-9.7.0/test/IECore/Turbulence.py diff --git a/cortex-9.6.0/test/IECore/TypeIdTest.py b/cortex-9.7.0/test/IECore/TypeIdTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TypeIdTest.py rename to cortex-9.7.0/test/IECore/TypeIdTest.py diff --git a/cortex-9.6.0/test/IECore/TypeTraitsTest.cpp b/cortex-9.7.0/test/IECore/TypeTraitsTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/TypeTraitsTest.cpp rename to cortex-9.7.0/test/IECore/TypeTraitsTest.cpp diff --git a/cortex-9.6.0/test/IECore/TypedDataAsObject.py b/cortex-9.7.0/test/IECore/TypedDataAsObject.py similarity index 100% rename from cortex-9.6.0/test/IECore/TypedDataAsObject.py rename to cortex-9.7.0/test/IECore/TypedDataAsObject.py diff --git a/cortex-9.6.0/test/IECore/TypedDataTest.cpp b/cortex-9.7.0/test/IECore/TypedDataTest.cpp similarity index 100% rename from cortex-9.6.0/test/IECore/TypedDataTest.cpp rename to cortex-9.7.0/test/IECore/TypedDataTest.cpp diff --git a/cortex-9.6.0/test/IECore/TypedDataTest.h b/cortex-9.7.0/test/IECore/TypedDataTest.h similarity index 100% rename from cortex-9.6.0/test/IECore/TypedDataTest.h rename to cortex-9.7.0/test/IECore/TypedDataTest.h diff --git a/cortex-9.6.0/test/IECore/TypedDataTest.inl b/cortex-9.7.0/test/IECore/TypedDataTest.inl similarity index 100% rename from cortex-9.6.0/test/IECore/TypedDataTest.inl rename to cortex-9.7.0/test/IECore/TypedDataTest.inl diff --git a/cortex-9.6.0/test/IECore/TypedDataTest.py b/cortex-9.7.0/test/IECore/TypedDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/TypedDataTest.py rename to cortex-9.7.0/test/IECore/TypedDataTest.py diff --git a/cortex-9.6.0/test/IECore/TypedPrimitiveOp.py b/cortex-9.7.0/test/IECore/TypedPrimitiveOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/TypedPrimitiveOp.py rename to cortex-9.7.0/test/IECore/TypedPrimitiveOp.py diff --git a/cortex-9.6.0/test/IECore/UVDistortOpTest.py b/cortex-9.7.0/test/IECore/UVDistortOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/UVDistortOpTest.py rename to cortex-9.7.0/test/IECore/UVDistortOpTest.py diff --git a/cortex-9.6.0/test/IECore/UnicodeToStringTest.py b/cortex-9.7.0/test/IECore/UnicodeToStringTest.py similarity index 100% rename from cortex-9.6.0/test/IECore/UnicodeToStringTest.py rename to cortex-9.7.0/test/IECore/UnicodeToStringTest.py diff --git a/cortex-9.6.0/test/IECore/VectorData.py b/cortex-9.7.0/test/IECore/VectorData.py similarity index 100% rename from cortex-9.6.0/test/IECore/VectorData.py rename to cortex-9.7.0/test/IECore/VectorData.py diff --git a/cortex-9.6.0/test/IECore/VectorDataFilterOp.py b/cortex-9.7.0/test/IECore/VectorDataFilterOp.py similarity index 100% rename from cortex-9.6.0/test/IECore/VectorDataFilterOp.py rename to cortex-9.7.0/test/IECore/VectorDataFilterOp.py diff --git a/cortex-9.6.0/test/IECore/WrapperGarbageCollection.py b/cortex-9.7.0/test/IECore/WrapperGarbageCollection.py similarity index 100% rename from cortex-9.6.0/test/IECore/WrapperGarbageCollection.py rename to cortex-9.7.0/test/IECore/WrapperGarbageCollection.py diff --git a/cortex-9.6.0/test/IECore/WrapperToPython.py b/cortex-9.7.0/test/IECore/WrapperToPython.py similarity index 100% rename from cortex-9.6.0/test/IECore/WrapperToPython.py rename to cortex-9.7.0/test/IECore/WrapperToPython.py diff --git a/cortex-9.6.0/test/IECore/Writer.py b/cortex-9.7.0/test/IECore/Writer.py similarity index 100% rename from cortex-9.6.0/test/IECore/Writer.py rename to cortex-9.7.0/test/IECore/Writer.py diff --git a/cortex-9.6.0/test/IECore/YUVImageWriter.py b/cortex-9.7.0/test/IECore/YUVImageWriter.py similarity index 100% rename from cortex-9.6.0/test/IECore/YUVImageWriter.py rename to cortex-9.7.0/test/IECore/YUVImageWriter.py diff --git a/cortex-9.6.0/test/IECore/config/exceptions/badConfig.py b/cortex-9.7.0/test/IECore/config/exceptions/badConfig.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/exceptions/badConfig.py rename to cortex-9.7.0/test/IECore/config/exceptions/badConfig.py diff --git a/cortex-9.6.0/test/IECore/config/getFile/config.py b/cortex-9.7.0/test/IECore/config/getFile/config.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/getFile/config.py rename to cortex-9.7.0/test/IECore/config/getFile/config.py diff --git a/cortex-9.6.0/test/IECore/config/ignoreFiles/a.py b/cortex-9.7.0/test/IECore/config/ignoreFiles/a.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/ignoreFiles/a.py rename to cortex-9.7.0/test/IECore/config/ignoreFiles/a.py diff --git a/cortex-9.6.0/test/IECore/config/ignoreFiles/notDotPy b/cortex-9.7.0/test/IECore/config/ignoreFiles/notDotPy similarity index 100% rename from cortex-9.6.0/test/IECore/config/ignoreFiles/notDotPy rename to cortex-9.7.0/test/IECore/config/ignoreFiles/notDotPy diff --git a/cortex-9.6.0/test/IECore/config/ignoreFiles/~config.py b/cortex-9.7.0/test/IECore/config/ignoreFiles/~config.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/ignoreFiles/~config.py rename to cortex-9.7.0/test/IECore/config/ignoreFiles/~config.py diff --git a/cortex-9.6.0/test/IECore/config/orderDir/a.py b/cortex-9.7.0/test/IECore/config/orderDir/a.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/orderDir/a.py rename to cortex-9.7.0/test/IECore/config/orderDir/a.py diff --git a/cortex-9.6.0/test/IECore/config/orderDir/b.py b/cortex-9.7.0/test/IECore/config/orderDir/b.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/orderDir/b.py rename to cortex-9.7.0/test/IECore/config/orderDir/b.py diff --git a/cortex-9.6.0/test/IECore/config/orderOne/config.py b/cortex-9.7.0/test/IECore/config/orderOne/config.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/orderOne/config.py rename to cortex-9.7.0/test/IECore/config/orderOne/config.py diff --git a/cortex-9.6.0/test/IECore/config/orderTwo/config.py b/cortex-9.7.0/test/IECore/config/orderTwo/config.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/orderTwo/config.py rename to cortex-9.7.0/test/IECore/config/orderTwo/config.py diff --git a/cortex-9.6.0/test/IECore/config/scope/testScope.py b/cortex-9.7.0/test/IECore/config/scope/testScope.py similarity index 100% rename from cortex-9.6.0/test/IECore/config/scope/testScope.py rename to cortex-9.7.0/test/IECore/config/scope/testScope.py diff --git a/cortex-9.6.0/test/IECore/data/StandardRadialLens.cob b/cortex-9.7.0/test/IECore/data/StandardRadialLens.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/StandardRadialLens.cob rename to cortex-9.7.0/test/IECore/data/StandardRadialLens.cob diff --git a/cortex-9.6.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob b/cortex-9.7.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob rename to cortex-9.7.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob diff --git a/cortex-9.6.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py b/cortex-9.7.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py rename to cortex-9.7.0/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py diff --git a/cortex-9.6.0/test/IECore/data/cachedReaderPath1/file.cob b/cortex-9.7.0/test/IECore/data/cachedReaderPath1/file.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cachedReaderPath1/file.cob rename to cortex-9.7.0/test/IECore/data/cachedReaderPath1/file.cob diff --git a/cortex-9.6.0/test/IECore/data/cachedReaderPath2/file.cob b/cortex-9.7.0/test/IECore/data/cachedReaderPath2/file.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cachedReaderPath2/file.cob rename to cortex-9.7.0/test/IECore/data/cachedReaderPath2/file.cob diff --git a/cortex-9.6.0/test/IECore/data/cinFiles/bluegreen_noise.cin b/cortex-9.7.0/test/IECore/data/cinFiles/bluegreen_noise.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/cinFiles/bluegreen_noise.cin rename to cortex-9.7.0/test/IECore/data/cinFiles/bluegreen_noise.cin diff --git a/cortex-9.6.0/test/IECore/data/cinFiles/flag_16x16.cin b/cortex-9.7.0/test/IECore/data/cinFiles/flag_16x16.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/cinFiles/flag_16x16.cin rename to cortex-9.7.0/test/IECore/data/cinFiles/flag_16x16.cin diff --git a/cortex-9.6.0/test/IECore/data/cinFiles/ramp.cin b/cortex-9.7.0/test/IECore/data/cinFiles/ramp.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/cinFiles/ramp.cin rename to cortex-9.7.0/test/IECore/data/cinFiles/ramp.cin diff --git a/cortex-9.6.0/test/IECore/data/cinFiles/uvMap.512x256.cin b/cortex-9.7.0/test/IECore/data/cinFiles/uvMap.512x256.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/cinFiles/uvMap.512x256.cin rename to cortex-9.7.0/test/IECore/data/cinFiles/uvMap.512x256.cin diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/ball.cob b/cortex-9.7.0/test/IECore/data/cobFiles/ball.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/ball.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/ball.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob b/cortex-9.7.0/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/compoundData.cob b/cortex-9.7.0/test/IECore/data/cobFiles/compoundData.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/compoundData.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/compoundData.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/compoundDataAsSQL.cob b/cortex-9.7.0/test/IECore/data/cobFiles/compoundDataAsSQL.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/compoundDataAsSQL.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/compoundDataAsSQL.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob b/cortex-9.7.0/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/cylinder3Mesh.cob b/cortex-9.7.0/test/IECore/data/cobFiles/cylinder3Mesh.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/cylinder3Mesh.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/cylinder3Mesh.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/filteredBall.cob b/cortex-9.7.0/test/IECore/data/cobFiles/filteredBall.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/filteredBall.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/filteredBall.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/header.cob b/cortex-9.7.0/test/IECore/data/cobFiles/header.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/header.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/header.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/intDataTen.cob b/cortex-9.7.0/test/IECore/data/cobFiles/intDataTen.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/intDataTen.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/intDataTen.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/intDataTenAsSQL.cob b/cortex-9.7.0/test/IECore/data/cobFiles/intDataTenAsSQL.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/intDataTenAsSQL.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/intDataTenAsSQL.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/meshPrimitiveV0.cob b/cortex-9.7.0/test/IECore/data/cobFiles/meshPrimitiveV0.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/meshPrimitiveV0.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/meshPrimitiveV0.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/pCubeShape1.cob b/cortex-9.7.0/test/IECore/data/cobFiles/pCubeShape1.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/pCubeShape1.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/pCubeShape1.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/pSphereShape1.cob b/cortex-9.7.0/test/IECore/data/cobFiles/pSphereShape1.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/pSphereShape1.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/pSphereShape1.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/polySphereQuads.cob b/cortex-9.7.0/test/IECore/data/cobFiles/polySphereQuads.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/polySphereQuads.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/polySphereQuads.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/torusCurves.cob b/cortex-9.7.0/test/IECore/data/cobFiles/torusCurves.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/torusCurves.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/torusCurves.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob b/cortex-9.7.0/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob diff --git a/cortex-9.6.0/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob b/cortex-9.7.0/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob rename to cortex-9.7.0/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob diff --git a/cortex-9.6.0/test/IECore/data/dpx/bluegreen_noise.dpx b/cortex-9.7.0/test/IECore/data/dpx/bluegreen_noise.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/dpx/bluegreen_noise.dpx rename to cortex-9.7.0/test/IECore/data/dpx/bluegreen_noise.dpx diff --git a/cortex-9.6.0/test/IECore/data/dpx/colorBarsWithAlpha.dpx b/cortex-9.7.0/test/IECore/data/dpx/colorBarsWithAlpha.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/dpx/colorBarsWithAlpha.dpx rename to cortex-9.7.0/test/IECore/data/dpx/colorBarsWithAlpha.dpx diff --git a/cortex-9.6.0/test/IECore/data/dpx/ramp.dpx b/cortex-9.7.0/test/IECore/data/dpx/ramp.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/dpx/ramp.dpx rename to cortex-9.7.0/test/IECore/data/dpx/ramp.dpx diff --git a/cortex-9.6.0/test/IECore/data/dpx/uvMap.512x256.dpx b/cortex-9.7.0/test/IECore/data/dpx/uvMap.512x256.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/dpx/uvMap.512x256.dpx rename to cortex-9.7.0/test/IECore/data/dpx/uvMap.512x256.dpx diff --git a/cortex-9.6.0/test/IECore/data/empty b/cortex-9.7.0/test/IECore/data/empty similarity index 100% rename from cortex-9.6.0/test/IECore/data/empty rename to cortex-9.7.0/test/IECore/data/empty diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr b/cortex-9.7.0/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr b/cortex-9.7.0/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg b/cortex-9.7.0/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg rename to cortex-9.7.0/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMax.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMax.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMax.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMax.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMin.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMin.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMin.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMin.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpOver.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpOver.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCompositeOpOver.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCompositeOpOver.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow2.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow2.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow2.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow2.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff b/cortex-9.7.0/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff rename to cortex-9.7.0/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr b/cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr b/cortex-9.7.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr b/cortex-9.7.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/marschnerLookup.exr b/cortex-9.7.0/test/IECore/data/expectedResults/marschnerLookup.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/marschnerLookup.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/marschnerLookup.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob b/cortex-9.7.0/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob rename to cortex-9.7.0/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/meshVertexReorderSphere.cob b/cortex-9.7.0/test/IECore/data/expectedResults/meshVertexReorderSphere.cob similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/meshVertexReorderSphere.cob rename to cortex-9.7.0/test/IECore/data/expectedResults/meshVertexReorderSphere.cob diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff0.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff0.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff0.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff0.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff1.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff1.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff1.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff1.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff2.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff2.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff2.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff2.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff3.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff3.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff3.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff3.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff4.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff4.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff4.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff4.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff5.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff5.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff5.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff5.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff6.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff6.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff6.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff6.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff7.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff7.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff7.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff7.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff8.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff8.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff8.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff8.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff9.exr b/cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff9.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/multiDirTiff9.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/multiDirTiff9.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.cin b/cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.cin rename to cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.cin diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.dpx b/cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.dpx rename to cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.dpx diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.jpg b/cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.jpg rename to cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.jpg diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.tga b/cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.tga similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.tga rename to cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.tga diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.tiff b/cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/oversizeDataWindow.tiff rename to cortex-9.7.0/test/IECore/data/expectedResults/oversizeDataWindow.tiff diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0000.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0000.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0000.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0000.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0001.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0001.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0001.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0001.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0002.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0002.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0002.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0002.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0003.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0003.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0003.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0003.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0004.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0004.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlin3d.0004.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlin3d.0004.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlinV2fColor3f.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlinV2fColor3f.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlinV2fColor3f.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlinV2fColor3f.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlinV2ff.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlinV2ff.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlinV2ff.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlinV2ff.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/perlinff.exr b/cortex-9.7.0/test/IECore/data/expectedResults/perlinff.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/perlinff.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/perlinff.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/turbulence2d.exr b/cortex-9.7.0/test/IECore/data/expectedResults/turbulence2d.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/turbulence2d.exr rename to cortex-9.7.0/test/IECore/data/expectedResults/turbulence2d.exr diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin b/cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin rename to cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx b/cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx rename to cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg b/cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg rename to cortex-9.7.0/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.cin b/cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.cin rename to cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.cin diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.dpx b/cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.dpx similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.dpx rename to cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.dpx diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.jpg b/cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.jpg rename to cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.jpg diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.tga b/cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.tga similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.tga rename to cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.tga diff --git a/cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.tif b/cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/expectedResults/windowWrite.tif rename to cortex-9.7.0/test/IECore/data/expectedResults/windowWrite.tif diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/AllHalfValues.exr b/cortex-9.7.0/test/IECore/data/exrFiles/AllHalfValues.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/AllHalfValues.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/AllHalfValues.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/carPark.exr b/cortex-9.7.0/test/IECore/data/exrFiles/carPark.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/carPark.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/carPark.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checker1Premult.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checker1Premult.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checker1Premult.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checker1Premult.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checker1Unpremult.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checker1Unpremult.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checker1Unpremult.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checker1Unpremult.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checker2Premult.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checker2Premult.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checker2Premult.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checker2Premult.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checker2PremultSRGB.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checker2PremultSRGB.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checker2PremultSRGB.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checker2PremultSRGB.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checker2Unpremult.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checker2Unpremult.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checker2Unpremult.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checker2Unpremult.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0001.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0001.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0001.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0001.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0002.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0002.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0002.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0002.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0003.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0003.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0003.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0003.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0004.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0004.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0004.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0004.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0005.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0005.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0005.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0005.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0006.exr b/cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0006.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/checkerAnimated.0006.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/checkerAnimated.0006.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsWithAlpha.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsWithAlpha.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsWithAlpha.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsWithAlpha.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr b/cortex-9.7.0/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/distorted_21mm_uv.exr b/cortex-9.7.0/test/IECore/data/exrFiles/distorted_21mm_uv.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/distorted_21mm_uv.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/distorted_21mm_uv.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/float256x256.exr b/cortex-9.7.0/test/IECore/data/exrFiles/float256x256.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/float256x256.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/float256x256.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/gradedRamp.exr b/cortex-9.7.0/test/IECore/data/exrFiles/gradedRamp.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/gradedRamp.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/gradedRamp.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/incomplete.exr b/cortex-9.7.0/test/IECore/data/exrFiles/incomplete.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/incomplete.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/incomplete.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/manyChannels.exr b/cortex-9.7.0/test/IECore/data/exrFiles/manyChannels.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/manyChannels.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/manyChannels.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/oversizeDataWindow.exr b/cortex-9.7.0/test/IECore/data/exrFiles/oversizeDataWindow.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/oversizeDataWindow.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/oversizeDataWindow.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/ramp.exr b/cortex-9.7.0/test/IECore/data/exrFiles/ramp.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/ramp.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/ramp.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr b/cortex-9.7.0/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr b/cortex-9.7.0/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/undistorted_21mm_uv.exr b/cortex-9.7.0/test/IECore/data/exrFiles/undistorted_21mm_uv.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/undistorted_21mm_uv.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/undistorted_21mm_uv.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/uvMap.256x256.exr b/cortex-9.7.0/test/IECore/data/exrFiles/uvMap.256x256.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/uvMap.256x256.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/uvMap.256x256.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/uvMap.512x256.exr b/cortex-9.7.0/test/IECore/data/exrFiles/uvMap.512x256.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/uvMap.512x256.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/uvMap.512x256.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr b/cortex-9.7.0/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr diff --git a/cortex-9.6.0/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr b/cortex-9.7.0/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr similarity index 100% rename from cortex-9.6.0/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr rename to cortex-9.7.0/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio b/cortex-9.7.0/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.6.0/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio rename to cortex-9.7.0/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio diff --git a/cortex-9.6.0/test/IECore/data/fonts/COPYRIGHT.TXT b/cortex-9.7.0/test/IECore/data/fonts/COPYRIGHT.TXT similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/COPYRIGHT.TXT rename to cortex-9.7.0/test/IECore/data/fonts/COPYRIGHT.TXT diff --git a/cortex-9.6.0/test/IECore/data/fonts/Vera.ttf b/cortex-9.7.0/test/IECore/data/fonts/Vera.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/Vera.ttf rename to cortex-9.7.0/test/IECore/data/fonts/Vera.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraBI.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraBI.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraBI.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraBI.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraBd.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraBd.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraBd.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraBd.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraIt.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraIt.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraIt.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraIt.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraMoBI.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraMoBI.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraMoBI.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraMoBI.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraMoBd.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraMoBd.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraMoBd.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraMoBd.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraMoIt.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraMoIt.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraMoIt.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraMoIt.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraMono.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraMono.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraMono.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraMono.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraSe.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraSe.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraSe.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraSe.ttf diff --git a/cortex-9.6.0/test/IECore/data/fonts/VeraSeBd.ttf b/cortex-9.7.0/test/IECore/data/fonts/VeraSeBd.ttf similarity index 100% rename from cortex-9.6.0/test/IECore/data/fonts/VeraSeBd.ttf rename to cortex-9.7.0/test/IECore/data/fonts/VeraSeBd.ttf diff --git a/cortex-9.6.0/test/IECore/data/idxFiles/test.idx b/cortex-9.7.0/test/IECore/data/idxFiles/test.idx similarity index 100% rename from cortex-9.6.0/test/IECore/data/idxFiles/test.idx rename to cortex-9.7.0/test/IECore/data/idxFiles/test.idx diff --git a/cortex-9.6.0/test/IECore/data/iffFiles/image.iff b/cortex-9.7.0/test/IECore/data/iffFiles/image.iff similarity index 100% rename from cortex-9.6.0/test/IECore/data/iffFiles/image.iff rename to cortex-9.7.0/test/IECore/data/iffFiles/image.iff diff --git a/cortex-9.6.0/test/IECore/data/iffFiles/nClothFrame3.mc b/cortex-9.7.0/test/IECore/data/iffFiles/nClothFrame3.mc similarity index 100% rename from cortex-9.6.0/test/IECore/data/iffFiles/nClothFrame3.mc rename to cortex-9.7.0/test/IECore/data/iffFiles/nClothFrame3.mc diff --git a/cortex-9.6.0/test/IECore/data/iffFiles/nParticleFrame2.mc b/cortex-9.7.0/test/IECore/data/iffFiles/nParticleFrame2.mc similarity index 100% rename from cortex-9.6.0/test/IECore/data/iffFiles/nParticleFrame2.mc rename to cortex-9.7.0/test/IECore/data/iffFiles/nParticleFrame2.mc diff --git a/cortex-9.6.0/test/IECore/data/iffFiles/nParticleMultipleFrames.mc b/cortex-9.7.0/test/IECore/data/iffFiles/nParticleMultipleFrames.mc similarity index 100% rename from cortex-9.6.0/test/IECore/data/iffFiles/nParticleMultipleFrames.mc rename to cortex-9.7.0/test/IECore/data/iffFiles/nParticleMultipleFrames.mc diff --git a/cortex-9.6.0/test/IECore/data/jpg/21mm.jpg b/cortex-9.7.0/test/IECore/data/jpg/21mm.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/21mm.jpg rename to cortex-9.7.0/test/IECore/data/jpg/21mm.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/bluegreen_noise.400x300.jpg b/cortex-9.7.0/test/IECore/data/jpg/bluegreen_noise.400x300.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/bluegreen_noise.400x300.jpg rename to cortex-9.7.0/test/IECore/data/jpg/bluegreen_noise.400x300.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/exif.jpg b/cortex-9.7.0/test/IECore/data/jpg/exif.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/exif.jpg rename to cortex-9.7.0/test/IECore/data/jpg/exif.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/greyscaleCheckerBoard.jpg b/cortex-9.7.0/test/IECore/data/jpg/greyscaleCheckerBoard.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/greyscaleCheckerBoard.jpg rename to cortex-9.7.0/test/IECore/data/jpg/greyscaleCheckerBoard.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/test test.jpg b/cortex-9.7.0/test/IECore/data/jpg/test test.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/test test.jpg rename to cortex-9.7.0/test/IECore/data/jpg/test test.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/uvMap.512x256.jpg b/cortex-9.7.0/test/IECore/data/jpg/uvMap.512x256.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/uvMap.512x256.jpg rename to cortex-9.7.0/test/IECore/data/jpg/uvMap.512x256.jpg diff --git a/cortex-9.6.0/test/IECore/data/jpg/uvMap.512x256.truncated.jpg b/cortex-9.7.0/test/IECore/data/jpg/uvMap.512x256.truncated.jpg similarity index 100% rename from cortex-9.6.0/test/IECore/data/jpg/uvMap.512x256.truncated.jpg rename to cortex-9.7.0/test/IECore/data/jpg/uvMap.512x256.truncated.jpg diff --git a/cortex-9.6.0/test/IECore/data/null b/cortex-9.7.0/test/IECore/data/null similarity index 100% rename from cortex-9.6.0/test/IECore/data/null rename to cortex-9.7.0/test/IECore/data/null diff --git a/cortex-9.6.0/test/IECore/data/null.cin b/cortex-9.7.0/test/IECore/data/null.cin similarity index 100% rename from cortex-9.6.0/test/IECore/data/null.cin rename to cortex-9.7.0/test/IECore/data/null.cin diff --git a/cortex-9.6.0/test/IECore/data/obj/groups.obj b/cortex-9.7.0/test/IECore/data/obj/groups.obj similarity index 100% rename from cortex-9.6.0/test/IECore/data/obj/groups.obj rename to cortex-9.7.0/test/IECore/data/obj/groups.obj diff --git a/cortex-9.6.0/test/IECore/data/obj/triangle.obj b/cortex-9.7.0/test/IECore/data/obj/triangle.obj similarity index 100% rename from cortex-9.6.0/test/IECore/data/obj/triangle.obj rename to cortex-9.7.0/test/IECore/data/obj/triangle.obj diff --git a/cortex-9.6.0/test/IECore/data/obj/triangle_no_texture.obj b/cortex-9.7.0/test/IECore/data/obj/triangle_no_texture.obj similarity index 100% rename from cortex-9.6.0/test/IECore/data/obj/triangle_no_texture.obj rename to cortex-9.7.0/test/IECore/data/obj/triangle_no_texture.obj diff --git a/cortex-9.6.0/test/IECore/data/obj/triangle_normals.obj b/cortex-9.7.0/test/IECore/data/obj/triangle_normals.obj similarity index 100% rename from cortex-9.6.0/test/IECore/data/obj/triangle_normals.obj rename to cortex-9.7.0/test/IECore/data/obj/triangle_normals.obj diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/10Particles.pdc b/cortex-9.7.0/test/IECore/data/pdcFiles/10Particles.pdc similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/10Particles.pdc rename to cortex-9.7.0/test/IECore/data/pdcFiles/10Particles.pdc diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/particleMesh.pdc b/cortex-9.7.0/test/IECore/data/pdcFiles/particleMesh.pdc similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/particleMesh.pdc rename to cortex-9.7.0/test/IECore/data/pdcFiles/particleMesh.pdc diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.250.pdc b/cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.250.pdc similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.250.pdc rename to cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.250.pdc diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc b/cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc rename to cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc b/cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc rename to cortex-9.7.0/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc diff --git a/cortex-9.6.0/test/IECore/data/pdcFiles/scene.ma b/cortex-9.7.0/test/IECore/data/pdcFiles/scene.ma similarity index 100% rename from cortex-9.6.0/test/IECore/data/pdcFiles/scene.ma rename to cortex-9.7.0/test/IECore/data/pdcFiles/scene.ma diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.README b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.README similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.README rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.README diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/PngSuite.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/PngSuite.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi4a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi4a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi4a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi4a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi4a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi4a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi4a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi4a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi6a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi6a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi6a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi6a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi6a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi6a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basi6a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basi6a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn4a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn4a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn4a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn4a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn4a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn4a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn4a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn4a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn6a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn6a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn6a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn6a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn6a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn6a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/basn6a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/basn6a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgai4a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgai4a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgai4a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgai4a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgai4a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgai4a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgai4a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgai4a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgan6a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgan6a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgan6a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgan6a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgan6a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgan6a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgan6a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgan6a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgbn4a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgbn4a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgbn4a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgbn4a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bggn4a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bggn4a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bggn4a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bggn4a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgwn6a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgwn6a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgwn6a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgwn6a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgyn6a16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgyn6a16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/bgyn6a16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/bgyn6a16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ccwn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ccwn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ccwn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ccwn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ccwn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ccwn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ccwn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ccwn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdfn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdfn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdfn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdfn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdhn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdhn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdhn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdhn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdsn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdsn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdsn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdsn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdun2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdun2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cdun2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cdun2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ch1n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ch1n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ch1n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ch1n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ch2n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ch2n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ch2n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ch2n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm0n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm0n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm0n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm0n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm7n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm7n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm7n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm7n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm9n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm9n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cm9n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cm9n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs3n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs3n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs3n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs3n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs3n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs3n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs3n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs3n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs5n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs5n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs5n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs5n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs5n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs5n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs5n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs5n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs8n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs8n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs8n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs8n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs8n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs8n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cs8n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cs8n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ct0n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ct0n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ct0n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ct0n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ct1n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ct1n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ct1n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ct1n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cten0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cten0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cten0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cten0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctfn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctfn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctfn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctfn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctgn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctgn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctgn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctgn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/cthn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/cthn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/cthn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/cthn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctjn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctjn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctjn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctjn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctzn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctzn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ctzn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ctzn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f00n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f00n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f00n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f00n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f00n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f00n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f00n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f00n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f01n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f01n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f01n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f01n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f01n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f01n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f01n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f01n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f02n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f02n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f02n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f02n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f02n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f02n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f02n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f02n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f03n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f03n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f03n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f03n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f03n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f03n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f03n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f03n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f04n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f04n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f04n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f04n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f04n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f04n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f04n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f04n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/f99n0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/f99n0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/f99n0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/f99n0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g03n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g03n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g04n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g04n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g05n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g05n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g07n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g07n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g10n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g10n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/g25n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/g25n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi1n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi1n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi1n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi1n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi1n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi1n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi1n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi1n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi2n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi2n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi2n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi2n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi2n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi2n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi2n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi2n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi4n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi4n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi4n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi4n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi4n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi4n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi4n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi4n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi9n0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi9n0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi9n0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi9n0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi9n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi9n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/oi9n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/oi9n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/pp0n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/pp0n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/pp0n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/pp0n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/pp0n6a08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/pp0n6a08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/pp0n6a08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/pp0n6a08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps1n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps1n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps1n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps1n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps1n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps1n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps1n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps1n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps2n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps2n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps2n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps2n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps2n2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps2n2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/ps2n2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/ps2n2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s01i3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s01i3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s01i3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s01i3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s01n3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s01n3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s01n3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s01n3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s02i3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s02i3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s02i3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s02i3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s02n3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s02n3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s02n3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s02n3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s03i3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s03i3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s03i3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s03i3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s03n3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s03n3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s03n3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s03n3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s04i3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s04i3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s04i3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s04i3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s04n3p01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s04n3p01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s04n3p01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s04n3p01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s05i3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s05i3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s05i3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s05i3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s05n3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s05n3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s05n3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s05n3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s06i3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s06i3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s06i3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s06i3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s06n3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s06n3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s06n3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s06n3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s07i3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s07i3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s07i3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s07i3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s07n3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s07n3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s07n3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s07n3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s08i3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s08i3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s08i3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s08i3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s08n3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s08n3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s08n3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s08n3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s09i3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s09i3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s09i3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s09i3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s09n3p02.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s09n3p02.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s09n3p02.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s09n3p02.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s32i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s32i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s32i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s32i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s32n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s32n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s32n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s32n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s33i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s33i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s33i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s33i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s33n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s33n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s33n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s33n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s34i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s34i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s34i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s34i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s34n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s34n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s34n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s34n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s35i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s35i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s35i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s35i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s35n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s35n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s35n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s35n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s36i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s36i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s36i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s36i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s36n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s36n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s36n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s36n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s37i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s37i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s37i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s37i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s37n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s37n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s37n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s37n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s38i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s38i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s38i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s38i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s38n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s38n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s38n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s38n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s39i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s39i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s39i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s39i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s39n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s39n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s39n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s39n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s40i3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s40i3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s40i3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s40i3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/s40n3p04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/s40n3p04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/s40n3p04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/s40n3p04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbbn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbbn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbgn2c16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbgn2c16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbgn2c16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbgn2c16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbgn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbgn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbgn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbgn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbrn2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbrn2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbrn2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbrn2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbwn0g16.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbwn0g16.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbwn0g16.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbwn0g16.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbwn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbwn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbwn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbwn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbyn3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbyn3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tbyn3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tbyn3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp0n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp0n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp1n3p08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp1n3p08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/tp1n3p08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/tp1n3p08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xc1n0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xc1n0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xc1n0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xc1n0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xc9n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xc9n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xc9n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xc9n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xcrn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xcrn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xcrn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xcrn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xcsn0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xcsn0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xcsn0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xcsn0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd0n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd0n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd0n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd0n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd3n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd3n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd3n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd3n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd9n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd9n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xd9n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xd9n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xdtn0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xdtn0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xdtn0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xdtn0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xhdn0g08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xhdn0g08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xhdn0g08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xhdn0g08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xlfn0g04.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xlfn0g04.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xlfn0g04.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xlfn0g04.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs1n0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs1n0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs1n0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs1n0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs2n0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs2n0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs2n0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs2n0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs4n0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs4n0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs4n0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs4n0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs7n0g01.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs7n0g01.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/xs7n0g01.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/xs7n0g01.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/z00n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/z00n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/z00n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/z00n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/z03n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/z03n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/z03n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/z03n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/z06n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/z06n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/z06n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/z06n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/PngTestSuite/z09n2c08.png b/cortex-9.7.0/test/IECore/data/png/PngTestSuite/z09n2c08.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/PngTestSuite/z09n2c08.png rename to cortex-9.7.0/test/IECore/data/png/PngTestSuite/z09n2c08.png diff --git a/cortex-9.6.0/test/IECore/data/png/kodak_dx7590_test.png b/cortex-9.7.0/test/IECore/data/png/kodak_dx7590_test.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/kodak_dx7590_test.png rename to cortex-9.7.0/test/IECore/data/png/kodak_dx7590_test.png diff --git a/cortex-9.6.0/test/IECore/data/png/kodak_dx7590_test_truncated.png b/cortex-9.7.0/test/IECore/data/png/kodak_dx7590_test_truncated.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/kodak_dx7590_test_truncated.png rename to cortex-9.7.0/test/IECore/data/png/kodak_dx7590_test_truncated.png diff --git a/cortex-9.6.0/test/IECore/data/png/uvMap.512x256.8bit.png b/cortex-9.7.0/test/IECore/data/png/uvMap.512x256.8bit.png similarity index 100% rename from cortex-9.6.0/test/IECore/data/png/uvMap.512x256.8bit.png rename to cortex-9.7.0/test/IECore/data/png/uvMap.512x256.8bit.png diff --git a/cortex-9.6.0/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat b/cortex-9.7.0/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat similarity index 100% rename from cortex-9.6.0/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat rename to cortex-9.7.0/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/animatedSpheres.scc b/cortex-9.7.0/test/IECore/data/sccFiles/animatedSpheres.scc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/animatedSpheres.scc rename to cortex-9.7.0/test/IECore/data/sccFiles/animatedSpheres.scc diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/attributeAtRoot.scc b/cortex-9.7.0/test/IECore/data/sccFiles/attributeAtRoot.scc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/attributeAtRoot.scc rename to cortex-9.7.0/test/IECore/data/sccFiles/attributeAtRoot.scc diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/environment.lscc b/cortex-9.7.0/test/IECore/data/sccFiles/environment.lscc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/environment.lscc rename to cortex-9.7.0/test/IECore/data/sccFiles/environment.lscc diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/environment_newTags.lscc b/cortex-9.7.0/test/IECore/data/sccFiles/environment_newTags.lscc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/environment_newTags.lscc rename to cortex-9.7.0/test/IECore/data/sccFiles/environment_newTags.lscc diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/instancedSpheres.lscc b/cortex-9.7.0/test/IECore/data/sccFiles/instancedSpheres.lscc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/instancedSpheres.lscc rename to cortex-9.7.0/test/IECore/data/sccFiles/instancedSpheres.lscc diff --git a/cortex-9.6.0/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc b/cortex-9.7.0/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc similarity index 100% rename from cortex-9.6.0/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc rename to cortex-9.7.0/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc diff --git a/cortex-9.6.0/test/IECore/data/sgiFiles/maya.16bit.sgi b/cortex-9.7.0/test/IECore/data/sgiFiles/maya.16bit.sgi similarity index 100% rename from cortex-9.6.0/test/IECore/data/sgiFiles/maya.16bit.sgi rename to cortex-9.7.0/test/IECore/data/sgiFiles/maya.16bit.sgi diff --git a/cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi b/cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi similarity index 100% rename from cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi rename to cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi diff --git a/cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi b/cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi similarity index 100% rename from cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi rename to cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi diff --git a/cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi b/cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi similarity index 100% rename from cortex-9.6.0/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi rename to cortex-9.7.0/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi diff --git a/cortex-9.6.0/test/IECore/data/swaFiles/test.swa b/cortex-9.7.0/test/IECore/data/swaFiles/test.swa similarity index 100% rename from cortex-9.6.0/test/IECore/data/swaFiles/test.swa rename to cortex-9.7.0/test/IECore/data/swaFiles/test.swa diff --git a/cortex-9.6.0/test/IECore/data/tdl/grey50_BT709.tdl b/cortex-9.7.0/test/IECore/data/tdl/grey50_BT709.tdl similarity index 100% rename from cortex-9.6.0/test/IECore/data/tdl/grey50_BT709.tdl rename to cortex-9.7.0/test/IECore/data/tdl/grey50_BT709.tdl diff --git a/cortex-9.6.0/test/IECore/data/tdl/grey50_linear.tdl b/cortex-9.7.0/test/IECore/data/tdl/grey50_linear.tdl similarity index 100% rename from cortex-9.6.0/test/IECore/data/tdl/grey50_linear.tdl rename to cortex-9.7.0/test/IECore/data/tdl/grey50_linear.tdl diff --git a/cortex-9.6.0/test/IECore/data/tdl/grey50_srgb.tdl b/cortex-9.7.0/test/IECore/data/tdl/grey50_srgb.tdl similarity index 100% rename from cortex-9.6.0/test/IECore/data/tdl/grey50_srgb.tdl rename to cortex-9.7.0/test/IECore/data/tdl/grey50_srgb.tdl diff --git a/cortex-9.6.0/test/IECore/data/tgaFiles/uvMap.256x256.tga b/cortex-9.7.0/test/IECore/data/tgaFiles/uvMap.256x256.tga similarity index 100% rename from cortex-9.6.0/test/IECore/data/tgaFiles/uvMap.256x256.tga rename to cortex-9.7.0/test/IECore/data/tgaFiles/uvMap.256x256.tga diff --git a/cortex-9.6.0/test/IECore/data/tgaFiles/uvMap.512x256.tga b/cortex-9.7.0/test/IECore/data/tgaFiles/uvMap.512x256.tga similarity index 100% rename from cortex-9.6.0/test/IECore/data/tgaFiles/uvMap.512x256.tga rename to cortex-9.7.0/test/IECore/data/tgaFiles/uvMap.512x256.tga diff --git a/cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.200x150.tif b/cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.200x150.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.200x150.tif rename to cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.200x150.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.400x150.tif b/cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.400x150.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.400x150.tif rename to cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.400x150.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.400x300.tif b/cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.400x300.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.400x300.tif rename to cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.400x300.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.600x450.tif b/cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.600x450.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/bluegreen_noise.600x450.tif rename to cortex-9.7.0/test/IECore/data/tiff/bluegreen_noise.600x450.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/cropWindow.640x480.16bit.tif b/cortex-9.7.0/test/IECore/data/tiff/cropWindow.640x480.16bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/cropWindow.640x480.16bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/cropWindow.640x480.16bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/maya.tiff b/cortex-9.7.0/test/IECore/data/tiff/maya.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/maya.tiff rename to cortex-9.7.0/test/IECore/data/tiff/maya.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/problem.tdl b/cortex-9.7.0/test/IECore/data/tiff/problem.tdl similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/problem.tdl rename to cortex-9.7.0/test/IECore/data/tiff/problem.tdl diff --git a/cortex-9.6.0/test/IECore/data/tiff/pruned.tif b/cortex-9.7.0/test/IECore/data/tiff/pruned.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/pruned.tif rename to cortex-9.7.0/test/IECore/data/tiff/pruned.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/rgbCheckerboard.tiff b/cortex-9.7.0/test/IECore/data/tiff/rgbCheckerboard.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/rgbCheckerboard.tiff rename to cortex-9.7.0/test/IECore/data/tiff/rgbCheckerboard.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff b/cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff rename to cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff b/cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff rename to cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff b/cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff rename to cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.tiff b/cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.tiff similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/rgb_black_circle.256x256.tiff rename to cortex-9.7.0/test/IECore/data/tiff/rgb_black_circle.256x256.tiff diff --git a/cortex-9.6.0/test/IECore/data/tiff/singlePixelT.tif b/cortex-9.7.0/test/IECore/data/tiff/singlePixelT.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/singlePixelT.tif rename to cortex-9.7.0/test/IECore/data/tiff/singlePixelT.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/thinned.tif b/cortex-9.7.0/test/IECore/data/tiff/thinned.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/thinned.tif rename to cortex-9.7.0/test/IECore/data/tiff/thinned.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/tilesWithLeftovers.tif b/cortex-9.7.0/test/IECore/data/tiff/tilesWithLeftovers.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/tilesWithLeftovers.tif rename to cortex-9.7.0/test/IECore/data/tiff/tilesWithLeftovers.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/toThin.tif b/cortex-9.7.0/test/IECore/data/tiff/toThin.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/toThin.tif rename to cortex-9.7.0/test/IECore/data/tiff/toThin.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/toTrace.tif b/cortex-9.7.0/test/IECore/data/tiff/toTrace.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/toTrace.tif rename to cortex-9.7.0/test/IECore/data/tiff/toTrace.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/toTraceThinned.tif b/cortex-9.7.0/test/IECore/data/tiff/toTraceThinned.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/toTraceThinned.tif rename to cortex-9.7.0/test/IECore/data/tiff/toTraceThinned.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.16bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.16bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.16bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.16bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.32bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.32bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.32bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.32bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.8bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.8bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.512x256.8bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.512x256.8bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMap.multiRes.32bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMap.multiRes.32bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMap.multiRes.32bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMap.multiRes.32bit.tif diff --git a/cortex-9.6.0/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif b/cortex-9.7.0/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif similarity index 100% rename from cortex-9.6.0/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif rename to cortex-9.7.0/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif diff --git a/cortex-9.6.0/test/IECore/ops/bad/bad-1.py b/cortex-9.7.0/test/IECore/ops/bad/bad-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/bad/bad-1.py rename to cortex-9.7.0/test/IECore/ops/bad/bad-1.py diff --git a/cortex-9.6.0/test/IECore/ops/classParameterTest/classParameterTest-1.py b/cortex-9.7.0/test/IECore/ops/classParameterTest/classParameterTest-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/classParameterTest/classParameterTest-1.py rename to cortex-9.7.0/test/IECore/ops/classParameterTest/classParameterTest-1.py diff --git a/cortex-9.6.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py b/cortex-9.7.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py rename to cortex-9.7.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py diff --git a/cortex-9.6.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py b/cortex-9.7.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py rename to cortex-9.7.0/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py diff --git a/cortex-9.6.0/test/IECore/ops/colorSplineInput/colorSplineInput-1.py b/cortex-9.7.0/test/IECore/ops/colorSplineInput/colorSplineInput-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/colorSplineInput/colorSplineInput-1.py rename to cortex-9.7.0/test/IECore/ops/colorSplineInput/colorSplineInput-1.py diff --git a/cortex-9.6.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py b/cortex-9.7.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py rename to cortex-9.7.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py diff --git a/cortex-9.6.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py b/cortex-9.7.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py rename to cortex-9.7.0/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py diff --git a/cortex-9.6.0/test/IECore/ops/floatParameter/floatParameter-1.py b/cortex-9.7.0/test/IECore/ops/floatParameter/floatParameter-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/floatParameter/floatParameter-1.py rename to cortex-9.7.0/test/IECore/ops/floatParameter/floatParameter-1.py diff --git a/cortex-9.6.0/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py b/cortex-9.7.0/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py rename to cortex-9.7.0/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py diff --git a/cortex-9.6.0/test/IECore/ops/maths/multiply/multiply-1.py b/cortex-9.7.0/test/IECore/ops/maths/multiply/multiply-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/maths/multiply/multiply-1.py rename to cortex-9.7.0/test/IECore/ops/maths/multiply/multiply-1.py diff --git a/cortex-9.6.0/test/IECore/ops/maths/multiply/multiply-2.py b/cortex-9.7.0/test/IECore/ops/maths/multiply/multiply-2.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/maths/multiply/multiply-2.py rename to cortex-9.7.0/test/IECore/ops/maths/multiply/multiply-2.py diff --git a/cortex-9.6.0/test/IECore/ops/matrixParameter/matrixParameter-1.py b/cortex-9.7.0/test/IECore/ops/matrixParameter/matrixParameter-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/matrixParameter/matrixParameter-1.py rename to cortex-9.7.0/test/IECore/ops/matrixParameter/matrixParameter-1.py diff --git a/cortex-9.6.0/test/IECore/ops/mayaUserData/mayaUserData-1.py b/cortex-9.7.0/test/IECore/ops/mayaUserData/mayaUserData-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/mayaUserData/mayaUserData-1.py rename to cortex-9.7.0/test/IECore/ops/mayaUserData/mayaUserData-1.py diff --git a/cortex-9.6.0/test/IECore/ops/meshMerge/meshMerge-1.py b/cortex-9.7.0/test/IECore/ops/meshMerge/meshMerge-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/meshMerge/meshMerge-1.py rename to cortex-9.7.0/test/IECore/ops/meshMerge/meshMerge-1.py diff --git a/cortex-9.6.0/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py b/cortex-9.7.0/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py rename to cortex-9.7.0/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py diff --git a/cortex-9.6.0/test/IECore/ops/parameterTypes/parameterTypes-1.py b/cortex-9.7.0/test/IECore/ops/parameterTypes/parameterTypes-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/parameterTypes/parameterTypes-1.py rename to cortex-9.7.0/test/IECore/ops/parameterTypes/parameterTypes-1.py diff --git a/cortex-9.6.0/test/IECore/ops/path.With.Dot/multiply/multiply-1.py b/cortex-9.7.0/test/IECore/ops/path.With.Dot/multiply/multiply-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/path.With.Dot/multiply/multiply-1.py rename to cortex-9.7.0/test/IECore/ops/path.With.Dot/multiply/multiply-1.py diff --git a/cortex-9.6.0/test/IECore/ops/presetParsing/presetParsing-1.py b/cortex-9.7.0/test/IECore/ops/presetParsing/presetParsing-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/presetParsing/presetParsing-1.py rename to cortex-9.7.0/test/IECore/ops/presetParsing/presetParsing-1.py diff --git a/cortex-9.6.0/test/IECore/ops/splineInput/splineInput-1.py b/cortex-9.7.0/test/IECore/ops/splineInput/splineInput-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/splineInput/splineInput-1.py rename to cortex-9.7.0/test/IECore/ops/splineInput/splineInput-1.py diff --git a/cortex-9.6.0/test/IECore/ops/stringParsing/stringParsing-1.py b/cortex-9.7.0/test/IECore/ops/stringParsing/stringParsing-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/stringParsing/stringParsing-1.py rename to cortex-9.7.0/test/IECore/ops/stringParsing/stringParsing-1.py diff --git a/cortex-9.6.0/test/IECore/ops/unstorable/unstorable-1.py b/cortex-9.7.0/test/IECore/ops/unstorable/unstorable-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/ops/unstorable/unstorable-1.py rename to cortex-9.7.0/test/IECore/ops/unstorable/unstorable-1.py diff --git a/cortex-9.6.0/test/IECore/procedurals/image/image-1.py b/cortex-9.7.0/test/IECore/procedurals/image/image-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/procedurals/image/image-1.py rename to cortex-9.7.0/test/IECore/procedurals/image/image-1.py diff --git a/cortex-9.6.0/test/IECore/procedurals/read/read-1.py b/cortex-9.7.0/test/IECore/procedurals/read/read-1.py similarity index 100% rename from cortex-9.6.0/test/IECore/procedurals/read/read-1.py rename to cortex-9.7.0/test/IECore/procedurals/read/read-1.py diff --git a/cortex-9.6.0/test/IECoreGL/All.py b/cortex-9.7.0/test/IECoreGL/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/All.py rename to cortex-9.7.0/test/IECoreGL/All.py diff --git a/cortex-9.6.0/test/IECoreGL/AlphaTextureTest.py b/cortex-9.7.0/test/IECoreGL/AlphaTextureTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/AlphaTextureTest.py rename to cortex-9.7.0/test/IECoreGL/AlphaTextureTest.py diff --git a/cortex-9.6.0/test/IECoreGL/BufferTest.py b/cortex-9.7.0/test/IECoreGL/BufferTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/BufferTest.py rename to cortex-9.7.0/test/IECoreGL/BufferTest.py diff --git a/cortex-9.6.0/test/IECoreGL/CachedConverterTest.py b/cortex-9.7.0/test/IECoreGL/CachedConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/CachedConverterTest.py rename to cortex-9.7.0/test/IECoreGL/CachedConverterTest.py diff --git a/cortex-9.6.0/test/IECoreGL/Camera.py b/cortex-9.7.0/test/IECoreGL/Camera.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Camera.py rename to cortex-9.7.0/test/IECoreGL/Camera.py diff --git a/cortex-9.6.0/test/IECoreGL/CoordinateSystemTest.py b/cortex-9.7.0/test/IECoreGL/CoordinateSystemTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/CoordinateSystemTest.py rename to cortex-9.7.0/test/IECoreGL/CoordinateSystemTest.py diff --git a/cortex-9.6.0/test/IECoreGL/CurvesPrimitiveTest.py b/cortex-9.7.0/test/IECoreGL/CurvesPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/CurvesPrimitiveTest.py rename to cortex-9.7.0/test/IECoreGL/CurvesPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECoreGL/DeferredRenderer.py b/cortex-9.7.0/test/IECoreGL/DeferredRenderer.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/DeferredRenderer.py rename to cortex-9.7.0/test/IECoreGL/DeferredRenderer.py diff --git a/cortex-9.6.0/test/IECoreGL/DiskPrimitiveTest.py b/cortex-9.7.0/test/IECoreGL/DiskPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/DiskPrimitiveTest.py rename to cortex-9.7.0/test/IECoreGL/DiskPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECoreGL/FontLoaderTest.py b/cortex-9.7.0/test/IECoreGL/FontLoaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/FontLoaderTest.py rename to cortex-9.7.0/test/IECoreGL/FontLoaderTest.py diff --git a/cortex-9.6.0/test/IECoreGL/FontTest.py b/cortex-9.7.0/test/IECoreGL/FontTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/FontTest.py rename to cortex-9.7.0/test/IECoreGL/FontTest.py diff --git a/cortex-9.6.0/test/IECoreGL/Group.py b/cortex-9.7.0/test/IECoreGL/Group.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Group.py rename to cortex-9.7.0/test/IECoreGL/Group.py diff --git a/cortex-9.6.0/test/IECoreGL/HitRecord.py b/cortex-9.7.0/test/IECoreGL/HitRecord.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/HitRecord.py rename to cortex-9.7.0/test/IECoreGL/HitRecord.py diff --git a/cortex-9.6.0/test/IECoreGL/Image.py b/cortex-9.7.0/test/IECoreGL/Image.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Image.py rename to cortex-9.7.0/test/IECoreGL/Image.py diff --git a/cortex-9.6.0/test/IECoreGL/ImmediateRenderer.py b/cortex-9.7.0/test/IECoreGL/ImmediateRenderer.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ImmediateRenderer.py rename to cortex-9.7.0/test/IECoreGL/ImmediateRenderer.py diff --git a/cortex-9.6.0/test/IECoreGL/InstancingTest.py b/cortex-9.7.0/test/IECoreGL/InstancingTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/InstancingTest.py rename to cortex-9.7.0/test/IECoreGL/InstancingTest.py diff --git a/cortex-9.6.0/test/IECoreGL/LuminanceTextureTest.py b/cortex-9.7.0/test/IECoreGL/LuminanceTextureTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/LuminanceTextureTest.py rename to cortex-9.7.0/test/IECoreGL/LuminanceTextureTest.py diff --git a/cortex-9.6.0/test/IECoreGL/MeshPrimitiveTest.py b/cortex-9.7.0/test/IECoreGL/MeshPrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/MeshPrimitiveTest.py rename to cortex-9.7.0/test/IECoreGL/MeshPrimitiveTest.py diff --git a/cortex-9.6.0/test/IECoreGL/NameStateComponent.py b/cortex-9.7.0/test/IECoreGL/NameStateComponent.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/NameStateComponent.py rename to cortex-9.7.0/test/IECoreGL/NameStateComponent.py diff --git a/cortex-9.6.0/test/IECoreGL/Orientation.py b/cortex-9.7.0/test/IECoreGL/Orientation.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Orientation.py rename to cortex-9.7.0/test/IECoreGL/Orientation.py diff --git a/cortex-9.6.0/test/IECoreGL/PointsPrimitive.py b/cortex-9.7.0/test/IECoreGL/PointsPrimitive.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/PointsPrimitive.py rename to cortex-9.7.0/test/IECoreGL/PointsPrimitive.py diff --git a/cortex-9.6.0/test/IECoreGL/PrimitiveTest.py b/cortex-9.7.0/test/IECoreGL/PrimitiveTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/PrimitiveTest.py rename to cortex-9.7.0/test/IECoreGL/PrimitiveTest.py diff --git a/cortex-9.6.0/test/IECoreGL/Renderer.py b/cortex-9.7.0/test/IECoreGL/Renderer.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Renderer.py rename to cortex-9.7.0/test/IECoreGL/Renderer.py diff --git a/cortex-9.6.0/test/IECoreGL/Selection.py b/cortex-9.7.0/test/IECoreGL/Selection.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Selection.py rename to cortex-9.7.0/test/IECoreGL/Selection.py diff --git a/cortex-9.6.0/test/IECoreGL/Shader.py b/cortex-9.7.0/test/IECoreGL/Shader.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Shader.py rename to cortex-9.7.0/test/IECoreGL/Shader.py diff --git a/cortex-9.6.0/test/IECoreGL/ShaderLoaderTest.py b/cortex-9.7.0/test/IECoreGL/ShaderLoaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ShaderLoaderTest.py rename to cortex-9.7.0/test/IECoreGL/ShaderLoaderTest.py diff --git a/cortex-9.6.0/test/IECoreGL/ShaderStateComponentTest.py b/cortex-9.7.0/test/IECoreGL/ShaderStateComponentTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ShaderStateComponentTest.py rename to cortex-9.7.0/test/IECoreGL/ShaderStateComponentTest.py diff --git a/cortex-9.6.0/test/IECoreGL/ShadingTest.py b/cortex-9.7.0/test/IECoreGL/ShadingTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ShadingTest.py rename to cortex-9.7.0/test/IECoreGL/ShadingTest.py diff --git a/cortex-9.6.0/test/IECoreGL/State.py b/cortex-9.7.0/test/IECoreGL/State.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/State.py rename to cortex-9.7.0/test/IECoreGL/State.py diff --git a/cortex-9.6.0/test/IECoreGL/TextTest.py b/cortex-9.7.0/test/IECoreGL/TextTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/TextTest.py rename to cortex-9.7.0/test/IECoreGL/TextTest.py diff --git a/cortex-9.6.0/test/IECoreGL/Texture.py b/cortex-9.7.0/test/IECoreGL/Texture.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/Texture.py rename to cortex-9.7.0/test/IECoreGL/Texture.py diff --git a/cortex-9.6.0/test/IECoreGL/TextureLoaderTest.py b/cortex-9.7.0/test/IECoreGL/TextureLoaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/TextureLoaderTest.py rename to cortex-9.7.0/test/IECoreGL/TextureLoaderTest.py diff --git a/cortex-9.6.0/test/IECoreGL/ToGLConverterTest.py b/cortex-9.7.0/test/IECoreGL/ToGLConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ToGLConverterTest.py rename to cortex-9.7.0/test/IECoreGL/ToGLConverterTest.py diff --git a/cortex-9.6.0/test/IECoreGL/ToGLStateConverterTest.py b/cortex-9.7.0/test/IECoreGL/ToGLStateConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ToGLStateConverterTest.py rename to cortex-9.7.0/test/IECoreGL/ToGLStateConverterTest.py diff --git a/cortex-9.6.0/test/IECoreGL/ToGLTextureConverter.py b/cortex-9.7.0/test/IECoreGL/ToGLTextureConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/ToGLTextureConverter.py rename to cortex-9.7.0/test/IECoreGL/ToGLTextureConverter.py diff --git a/cortex-9.6.0/test/IECoreGL/UserAttributesTest.py b/cortex-9.7.0/test/IECoreGL/UserAttributesTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreGL/UserAttributesTest.py rename to cortex-9.7.0/test/IECoreGL/UserAttributesTest.py diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/glPoints.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/glPoints.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/glPoints.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/glPoints.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/meshST.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/meshST.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/meshST.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/meshST.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/pointVertexAttributes.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/pointVertexAttributes.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/pointVertexAttributes.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/pointVertexAttributes.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/proceduralTest.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/proceduralTest.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/proceduralTest.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/proceduralTest.tif diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/rotatedPointPatches.exr b/cortex-9.7.0/test/IECoreGL/expectedOutput/rotatedPointPatches.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/rotatedPointPatches.exr rename to cortex-9.7.0/test/IECoreGL/expectedOutput/rotatedPointPatches.exr diff --git a/cortex-9.6.0/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif b/cortex-9.7.0/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif rename to cortex-9.7.0/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/a.tif b/cortex-9.7.0/test/IECoreGL/images/a.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/a.tif rename to cortex-9.7.0/test/IECoreGL/images/a.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/bSplineCircle.tif b/cortex-9.7.0/test/IECoreGL/images/bSplineCircle.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/bSplineCircle.tif rename to cortex-9.7.0/test/IECoreGL/images/bSplineCircle.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/bezierHorseShoe.tif b/cortex-9.7.0/test/IECoreGL/images/bezierHorseShoe.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/bezierHorseShoe.tif rename to cortex-9.7.0/test/IECoreGL/images/bezierHorseShoe.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsH512x512.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsH512x512.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsH512x512.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsH512x512.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsH640x480.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsH640x480.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsH640x480.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsH640x480.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr b/cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr rename to cortex-9.7.0/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/disk.tif b/cortex-9.7.0/test/IECoreGL/images/disk.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/disk.tif rename to cortex-9.7.0/test/IECoreGL/images/disk.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/helloWorld.tif b/cortex-9.7.0/test/IECoreGL/images/helloWorld.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/helloWorld.tif rename to cortex-9.7.0/test/IECoreGL/images/helloWorld.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/helloWorldSprites.tif b/cortex-9.7.0/test/IECoreGL/images/helloWorldSprites.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/helloWorldSprites.tif rename to cortex-9.7.0/test/IECoreGL/images/helloWorldSprites.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/linearHorseShoeRibbon.tif b/cortex-9.7.0/test/IECoreGL/images/linearHorseShoeRibbon.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/linearHorseShoeRibbon.tif rename to cortex-9.7.0/test/IECoreGL/images/linearHorseShoeRibbon.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/linearPeriodicRibbon.tif b/cortex-9.7.0/test/IECoreGL/images/linearPeriodicRibbon.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/linearPeriodicRibbon.tif rename to cortex-9.7.0/test/IECoreGL/images/linearPeriodicRibbon.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/numberWithAlpha.exr b/cortex-9.7.0/test/IECoreGL/images/numberWithAlpha.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/numberWithAlpha.exr rename to cortex-9.7.0/test/IECoreGL/images/numberWithAlpha.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/numbers.exr b/cortex-9.7.0/test/IECoreGL/images/numbers.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/numbers.exr rename to cortex-9.7.0/test/IECoreGL/images/numbers.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/numbersWithAlpha.exr b/cortex-9.7.0/test/IECoreGL/images/numbersWithAlpha.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/numbersWithAlpha.exr rename to cortex-9.7.0/test/IECoreGL/images/numbersWithAlpha.exr diff --git a/cortex-9.6.0/test/IECoreGL/images/periodicBSpline.tif b/cortex-9.7.0/test/IECoreGL/images/periodicBSpline.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/periodicBSpline.tif rename to cortex-9.7.0/test/IECoreGL/images/periodicBSpline.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/twoBSplineCircles.tif b/cortex-9.7.0/test/IECoreGL/images/twoBSplineCircles.tif similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/twoBSplineCircles.tif rename to cortex-9.7.0/test/IECoreGL/images/twoBSplineCircles.tif diff --git a/cortex-9.6.0/test/IECoreGL/images/yellow.exr b/cortex-9.7.0/test/IECoreGL/images/yellow.exr similarity index 100% rename from cortex-9.6.0/test/IECoreGL/images/yellow.exr rename to cortex-9.7.0/test/IECoreGL/images/yellow.exr diff --git a/cortex-9.6.0/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt b/cortex-9.7.0/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt rename to cortex-9.7.0/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt diff --git a/cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Mandel.frag b/cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Mandel.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Mandel.frag rename to cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Mandel.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Mandel.vert b/cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Mandel.vert similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Mandel.vert rename to cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Mandel.vert diff --git a/cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Toon.frag b/cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Toon.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Toon.frag rename to cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Toon.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Toon.vert b/cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Toon.vert similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/3dLabs/Toon.vert rename to cortex-9.7.0/test/IECoreGL/shaders/3dLabs/Toon.vert diff --git a/cortex-9.6.0/test/IECoreGL/shaders/badPreprocessingDirective.frag b/cortex-9.7.0/test/IECoreGL/shaders/badPreprocessingDirective.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/badPreprocessingDirective.frag rename to cortex-9.7.0/test/IECoreGL/shaders/badPreprocessingDirective.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/color.frag b/cortex-9.7.0/test/IECoreGL/shaders/color.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/color.frag rename to cortex-9.7.0/test/IECoreGL/shaders/color.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/failWithoutPreprocessing.frag b/cortex-9.7.0/test/IECoreGL/shaders/failWithoutPreprocessing.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/failWithoutPreprocessing.frag rename to cortex-9.7.0/test/IECoreGL/shaders/failWithoutPreprocessing.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/grey.frag b/cortex-9.7.0/test/IECoreGL/shaders/grey.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/grey.frag rename to cortex-9.7.0/test/IECoreGL/shaders/grey.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/image.frag b/cortex-9.7.0/test/IECoreGL/shaders/image.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/image.frag rename to cortex-9.7.0/test/IECoreGL/shaders/image.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/include/macros.h b/cortex-9.7.0/test/IECoreGL/shaders/include/macros.h similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/include/macros.h rename to cortex-9.7.0/test/IECoreGL/shaders/include/macros.h diff --git a/cortex-9.6.0/test/IECoreGL/shaders/pointTripler.frag b/cortex-9.7.0/test/IECoreGL/shaders/pointTripler.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/pointTripler.frag rename to cortex-9.7.0/test/IECoreGL/shaders/pointTripler.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/pointTripler.geom b/cortex-9.7.0/test/IECoreGL/shaders/pointTripler.geom similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/pointTripler.geom rename to cortex-9.7.0/test/IECoreGL/shaders/pointTripler.geom diff --git a/cortex-9.6.0/test/IECoreGL/shaders/rgbColor.frag b/cortex-9.7.0/test/IECoreGL/shaders/rgbColor.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/rgbColor.frag rename to cortex-9.7.0/test/IECoreGL/shaders/rgbColor.frag diff --git a/cortex-9.6.0/test/IECoreGL/shaders/versionAndExtension.frag b/cortex-9.7.0/test/IECoreGL/shaders/versionAndExtension.frag similarity index 100% rename from cortex-9.6.0/test/IECoreGL/shaders/versionAndExtension.frag rename to cortex-9.7.0/test/IECoreGL/shaders/versionAndExtension.frag diff --git a/cortex-9.6.0/test/IECoreHoudini/ActiveTake.py b/cortex-9.7.0/test/IECoreHoudini/ActiveTake.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ActiveTake.py rename to cortex-9.7.0/test/IECoreHoudini/ActiveTake.py diff --git a/cortex-9.6.0/test/IECoreHoudini/All.py b/cortex-9.7.0/test/IECoreHoudini/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/All.py rename to cortex-9.7.0/test/IECoreHoudini/All.py diff --git a/cortex-9.6.0/test/IECoreHoudini/AttributeRemap.py b/cortex-9.7.0/test/IECoreHoudini/AttributeRemap.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/AttributeRemap.py rename to cortex-9.7.0/test/IECoreHoudini/AttributeRemap.py diff --git a/cortex-9.6.0/test/IECoreHoudini/CobIOTranslator.py b/cortex-9.7.0/test/IECoreHoudini/CobIOTranslator.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/CobIOTranslator.py rename to cortex-9.7.0/test/IECoreHoudini/CobIOTranslator.py diff --git a/cortex-9.6.0/test/IECoreHoudini/CortexConverterSop.py b/cortex-9.7.0/test/IECoreHoudini/CortexConverterSop.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/CortexConverterSop.py rename to cortex-9.7.0/test/IECoreHoudini/CortexConverterSop.py diff --git a/cortex-9.6.0/test/IECoreHoudini/CortexRmanInject.py b/cortex-9.7.0/test/IECoreHoudini/CortexRmanInject.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/CortexRmanInject.py rename to cortex-9.7.0/test/IECoreHoudini/CortexRmanInject.py diff --git a/cortex-9.6.0/test/IECoreHoudini/DeepImageConverter.py b/cortex-9.7.0/test/IECoreHoudini/DeepImageConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/DeepImageConverter.py rename to cortex-9.7.0/test/IECoreHoudini/DeepImageConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/FromHoudiniCurvesConverter.py b/cortex-9.7.0/test/IECoreHoudini/FromHoudiniCurvesConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/FromHoudiniCurvesConverter.py rename to cortex-9.7.0/test/IECoreHoudini/FromHoudiniCurvesConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/FromHoudiniGroupConverter.py b/cortex-9.7.0/test/IECoreHoudini/FromHoudiniGroupConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/FromHoudiniGroupConverter.py rename to cortex-9.7.0/test/IECoreHoudini/FromHoudiniGroupConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/FromHoudiniPointsConverter.py b/cortex-9.7.0/test/IECoreHoudini/FromHoudiniPointsConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/FromHoudiniPointsConverter.py rename to cortex-9.7.0/test/IECoreHoudini/FromHoudiniPointsConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/FromHoudiniPolygonsConverter.py b/cortex-9.7.0/test/IECoreHoudini/FromHoudiniPolygonsConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/FromHoudiniPolygonsConverter.py rename to cortex-9.7.0/test/IECoreHoudini/FromHoudiniPolygonsConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/LiveSceneTest.py b/cortex-9.7.0/test/IECoreHoudini/LiveSceneTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/LiveSceneTest.py rename to cortex-9.7.0/test/IECoreHoudini/LiveSceneTest.py diff --git a/cortex-9.6.0/test/IECoreHoudini/NodeHandle.py b/cortex-9.7.0/test/IECoreHoudini/NodeHandle.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/NodeHandle.py rename to cortex-9.7.0/test/IECoreHoudini/NodeHandle.py diff --git a/cortex-9.6.0/test/IECoreHoudini/OpHolder.py b/cortex-9.7.0/test/IECoreHoudini/OpHolder.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/OpHolder.py rename to cortex-9.7.0/test/IECoreHoudini/OpHolder.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ProceduralHolder.py b/cortex-9.7.0/test/IECoreHoudini/ProceduralHolder.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ProceduralHolder.py rename to cortex-9.7.0/test/IECoreHoudini/ProceduralHolder.py diff --git a/cortex-9.6.0/test/IECoreHoudini/RATDeepImageReaderTest.py b/cortex-9.7.0/test/IECoreHoudini/RATDeepImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/RATDeepImageReaderTest.py rename to cortex-9.7.0/test/IECoreHoudini/RATDeepImageReaderTest.py diff --git a/cortex-9.6.0/test/IECoreHoudini/RATDeepImageWriterTest.py b/cortex-9.7.0/test/IECoreHoudini/RATDeepImageWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/RATDeepImageWriterTest.py rename to cortex-9.7.0/test/IECoreHoudini/RATDeepImageWriterTest.py diff --git a/cortex-9.6.0/test/IECoreHoudini/SceneCacheTest.py b/cortex-9.7.0/test/IECoreHoudini/SceneCacheTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/SceneCacheTest.py rename to cortex-9.7.0/test/IECoreHoudini/SceneCacheTest.py diff --git a/cortex-9.6.0/test/IECoreHoudini/TemporaryParameterValuesTest.py b/cortex-9.7.0/test/IECoreHoudini/TemporaryParameterValuesTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/TemporaryParameterValuesTest.py rename to cortex-9.7.0/test/IECoreHoudini/TemporaryParameterValuesTest.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniCurvesConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniCurvesConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniCurvesConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniCurvesConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniGroupConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniGroupConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniGroupConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniGroupConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniPointsConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniPointsConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniPointsConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniPointsConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ToHoudiniPolygonsConverter.py b/cortex-9.7.0/test/IECoreHoudini/ToHoudiniPolygonsConverter.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ToHoudiniPolygonsConverter.py rename to cortex-9.7.0/test/IECoreHoudini/ToHoudiniPolygonsConverter.py diff --git a/cortex-9.6.0/test/IECoreHoudini/UpdateMode.py b/cortex-9.7.0/test/IECoreHoudini/UpdateMode.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/UpdateMode.py rename to cortex-9.7.0/test/IECoreHoudini/UpdateMode.py diff --git a/cortex-9.6.0/test/IECoreHoudini/data/otls/testHDAs.otl b/cortex-9.7.0/test/IECoreHoudini/data/otls/testHDAs.otl similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/otls/testHDAs.otl rename to cortex-9.7.0/test/IECoreHoudini/data/otls/testHDAs.otl diff --git a/cortex-9.6.0/test/IECoreHoudini/data/rat/planes.tif b/cortex-9.7.0/test/IECoreHoudini/data/rat/planes.tif similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/rat/planes.tif rename to cortex-9.7.0/test/IECoreHoudini/data/rat/planes.tif diff --git a/cortex-9.6.0/test/IECoreHoudini/data/rat/planesDCM.rat b/cortex-9.7.0/test/IECoreHoudini/data/rat/planesDCM.rat similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/rat/planesDCM.rat rename to cortex-9.7.0/test/IECoreHoudini/data/rat/planesDCM.rat diff --git a/cortex-9.6.0/test/IECoreHoudini/data/rat/planesMonoDSM.rat b/cortex-9.7.0/test/IECoreHoudini/data/rat/planesMonoDSM.rat similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/rat/planesMonoDSM.rat rename to cortex-9.7.0/test/IECoreHoudini/data/rat/planesMonoDSM.rat diff --git a/cortex-9.6.0/test/IECoreHoudini/data/rat/planesTripleDSM.rat b/cortex-9.7.0/test/IECoreHoudini/data/rat/planesTripleDSM.rat similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/rat/planesTripleDSM.rat rename to cortex-9.7.0/test/IECoreHoudini/data/rat/planesTripleDSM.rat diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torus.cob b/cortex-9.7.0/test/IECoreHoudini/data/torus.cob similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torus.cob rename to cortex-9.7.0/test/IECoreHoudini/data/torus.cob diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusH14.cob b/cortex-9.7.0/test/IECoreHoudini/data/torusH14.cob similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusH14.cob rename to cortex-9.7.0/test/IECoreHoudini/data/torusH14.cob diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0250.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0250.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0250.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0250.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0300.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0300.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0300.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0300.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0450.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0450.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0450.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0450.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0500.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0500.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0500.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0500.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0750.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0750.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.0750.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.0750.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.1000.fio b/cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.1000.fio similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusVertCache.1000.fio rename to cortex-9.7.0/test/IECoreHoudini/data/torusVertCache.1000.fio diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torusWithVertexNormals.bgeo b/cortex-9.7.0/test/IECoreHoudini/data/torusWithVertexNormals.bgeo similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torusWithVertexNormals.bgeo rename to cortex-9.7.0/test/IECoreHoudini/data/torusWithVertexNormals.bgeo diff --git a/cortex-9.6.0/test/IECoreHoudini/data/torus_with_normals.cob b/cortex-9.7.0/test/IECoreHoudini/data/torus_with_normals.cob similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/data/torus_with_normals.cob rename to cortex-9.7.0/test/IECoreHoudini/data/torus_with_normals.cob diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/cobReader/cobReader-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/cobReader/cobReader-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/cobReader/cobReader-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/cobReader/cobReader-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py b/cortex-9.7.0/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py rename to cortex-9.7.0/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py b/cortex-9.7.0/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py rename to cortex-9.7.0/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py diff --git a/cortex-9.6.0/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py b/cortex-9.7.0/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py rename to cortex-9.7.0/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py diff --git a/cortex-9.6.0/test/IECoreMaya/All.py b/cortex-9.7.0/test/IECoreMaya/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/All.py rename to cortex-9.7.0/test/IECoreMaya/All.py diff --git a/cortex-9.6.0/test/IECoreMaya/CallbackIdTest.py b/cortex-9.7.0/test/IECoreMaya/CallbackIdTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/CallbackIdTest.py rename to cortex-9.7.0/test/IECoreMaya/CallbackIdTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ConverterHolder.py b/cortex-9.7.0/test/IECoreMaya/ConverterHolder.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ConverterHolder.py rename to cortex-9.7.0/test/IECoreMaya/ConverterHolder.py diff --git a/cortex-9.6.0/test/IECoreMaya/DAGPathParametersTest.py b/cortex-9.7.0/test/IECoreMaya/DAGPathParametersTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/DAGPathParametersTest.py rename to cortex-9.7.0/test/IECoreMaya/DAGPathParametersTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FnParameterisedHolderTest.py b/cortex-9.7.0/test/IECoreMaya/FnParameterisedHolderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FnParameterisedHolderTest.py rename to cortex-9.7.0/test/IECoreMaya/FnParameterisedHolderTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FnProceduralHolderTest.py b/cortex-9.7.0/test/IECoreMaya/FnProceduralHolderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FnProceduralHolderTest.py rename to cortex-9.7.0/test/IECoreMaya/FnProceduralHolderTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FnSceneShapeTest.py b/cortex-9.7.0/test/IECoreMaya/FnSceneShapeTest.py similarity index 96% rename from cortex-9.6.0/test/IECoreMaya/FnSceneShapeTest.py rename to cortex-9.7.0/test/IECoreMaya/FnSceneShapeTest.py index 4cbe092ad5..78bdd5008c 100644 --- a/cortex-9.6.0/test/IECoreMaya/FnSceneShapeTest.py +++ b/cortex-9.7.0/test/IECoreMaya/FnSceneShapeTest.py @@ -184,12 +184,12 @@ def testConvertAllToGeometry( self ): fn.convertAllToGeometry() - children = set( ["|test|testSceneShape", "|test|sceneShape_1"] ) - self.assertEqual( set(maya.cmds.listRelatives( "|test", f=True )), children ) + children = ["|test|testSceneShape", "|test|sceneShape_1"] + self.assertEqual( maya.cmds.listRelatives( "|test", f=True ), children ) self.assertEqual( maya.cmds.getAttr( fn.fullPathName()+".intermediateObject" ), 1 ) - children = set( ["|test|sceneShape_1|sceneShape_SceneShape1", "|test|sceneShape_1|child", "|test|sceneShape_1|sceneShape_Shape1"] ) - self.assertEqual( set(maya.cmds.listRelatives( "|test|sceneShape_1", f=True )), children ) + children = ["|test|sceneShape_1|sceneShape_SceneShape1", "|test|sceneShape_1|child", "|test|sceneShape_1|sceneShape_Shape1"] + self.assertEqual( maya.cmds.listRelatives( "|test|sceneShape_1", f=True ), children ) self.assertEqual( maya.cmds.getAttr( "|test|sceneShape_1|sceneShape_SceneShape1.intermediateObject" ), 1 ) self.assertEqual( maya.cmds.nodeType( "|test|sceneShape_1|sceneShape_Shape1" ), "mesh") diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaCameraConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaCameraConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaCameraConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaCameraConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaCurveConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaCurveConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaCurveConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaCurveConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaGroupConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaGroupConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaGroupConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaGroupConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaLocatorConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaLocatorConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaLocatorConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaLocatorConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaMeshConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaMeshConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaMeshConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaMeshConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaObjectConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaObjectConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaObjectConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaObjectConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaParticleConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaParticleConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaParticleConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaParticleConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaPlugConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaPlugConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaPlugConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaPlugConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaSkinClusterConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaSkinClusterConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaSkinClusterConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaSkinClusterConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaTransformConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaTransformConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaTransformConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaTransformConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/FromMayaUnitPlugConverterTest.py b/cortex-9.7.0/test/IECoreMaya/FromMayaUnitPlugConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/FromMayaUnitPlugConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/FromMayaUnitPlugConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/GeometryCombinerTest.py b/cortex-9.7.0/test/IECoreMaya/GeometryCombinerTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/GeometryCombinerTest.py rename to cortex-9.7.0/test/IECoreMaya/GeometryCombinerTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ImageConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ImageConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ImageConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ImageConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/LiveSceneTest.py b/cortex-9.7.0/test/IECoreMaya/LiveSceneTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/LiveSceneTest.py rename to cortex-9.7.0/test/IECoreMaya/LiveSceneTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/MayaTypeIdTest.py b/cortex-9.7.0/test/IECoreMaya/MayaTypeIdTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/MayaTypeIdTest.py rename to cortex-9.7.0/test/IECoreMaya/MayaTypeIdTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/NamespacePollution.py b/cortex-9.7.0/test/IECoreMaya/NamespacePollution.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/NamespacePollution.py rename to cortex-9.7.0/test/IECoreMaya/NamespacePollution.py diff --git a/cortex-9.6.0/test/IECoreMaya/ObjectDataTest.py b/cortex-9.7.0/test/IECoreMaya/ObjectDataTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ObjectDataTest.py rename to cortex-9.7.0/test/IECoreMaya/ObjectDataTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ParameterisedHolder.py b/cortex-9.7.0/test/IECoreMaya/ParameterisedHolder.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ParameterisedHolder.py rename to cortex-9.7.0/test/IECoreMaya/ParameterisedHolder.py diff --git a/cortex-9.6.0/test/IECoreMaya/PlaybackFrameList.py b/cortex-9.7.0/test/IECoreMaya/PlaybackFrameList.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/PlaybackFrameList.py rename to cortex-9.7.0/test/IECoreMaya/PlaybackFrameList.py diff --git a/cortex-9.6.0/test/IECoreMaya/PluginLoadUnload.py b/cortex-9.7.0/test/IECoreMaya/PluginLoadUnload.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/PluginLoadUnload.py rename to cortex-9.7.0/test/IECoreMaya/PluginLoadUnload.py diff --git a/cortex-9.6.0/test/IECoreMaya/RunTimeTypedTest.py b/cortex-9.7.0/test/IECoreMaya/RunTimeTypedTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/RunTimeTypedTest.py rename to cortex-9.7.0/test/IECoreMaya/RunTimeTypedTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/SceneShapeTest.py b/cortex-9.7.0/test/IECoreMaya/SceneShapeTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/SceneShapeTest.py rename to cortex-9.7.0/test/IECoreMaya/SceneShapeTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/SplineParameterHandlerTest.py b/cortex-9.7.0/test/IECoreMaya/SplineParameterHandlerTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/SplineParameterHandlerTest.py rename to cortex-9.7.0/test/IECoreMaya/SplineParameterHandlerTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/TemporaryAttributeValuesTest.py b/cortex-9.7.0/test/IECoreMaya/TemporaryAttributeValuesTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/TemporaryAttributeValuesTest.py rename to cortex-9.7.0/test/IECoreMaya/TemporaryAttributeValuesTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaCameraConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaCameraConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaCameraConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaCameraConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaCurveConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaCurveConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaCurveConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaCurveConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaGroupConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaGroupConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaGroupConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaGroupConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaLocatorConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaLocatorConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaLocatorConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaLocatorConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaMeshConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaMeshConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaMeshConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaMeshConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaParticleConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaParticleConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaParticleConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaParticleConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaPlugConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaPlugConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaPlugConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaPlugConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/ToMayaSkinClusterConverterTest.py b/cortex-9.7.0/test/IECoreMaya/ToMayaSkinClusterConverterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/ToMayaSkinClusterConverterTest.py rename to cortex-9.7.0/test/IECoreMaya/ToMayaSkinClusterConverterTest.py diff --git a/cortex-9.6.0/test/IECoreMaya/scenes/colouredPlane.ma b/cortex-9.7.0/test/IECoreMaya/scenes/colouredPlane.ma similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/scenes/colouredPlane.ma rename to cortex-9.7.0/test/IECoreMaya/scenes/colouredPlane.ma diff --git a/cortex-9.6.0/test/IECoreMaya/scenes/splineWithSparseEntries.ma b/cortex-9.7.0/test/IECoreMaya/scenes/splineWithSparseEntries.ma similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/scenes/splineWithSparseEntries.ma rename to cortex-9.7.0/test/IECoreMaya/scenes/splineWithSparseEntries.ma diff --git a/cortex-9.6.0/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma b/cortex-9.7.0/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma rename to cortex-9.7.0/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma diff --git a/cortex-9.6.0/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma b/cortex-9.7.0/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma similarity index 100% rename from cortex-9.6.0/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma rename to cortex-9.7.0/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma diff --git a/cortex-9.6.0/test/IECoreNuke/All.py b/cortex-9.7.0/test/IECoreNuke/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/All.py rename to cortex-9.7.0/test/IECoreNuke/All.py diff --git a/cortex-9.6.0/test/IECoreNuke/DeepImageReaderTest.py b/cortex-9.7.0/test/IECoreNuke/DeepImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/DeepImageReaderTest.py rename to cortex-9.7.0/test/IECoreNuke/DeepImageReaderTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/FnAxisTest.py b/cortex-9.7.0/test/IECoreNuke/FnAxisTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/FnAxisTest.py rename to cortex-9.7.0/test/IECoreNuke/FnAxisTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/KnobAccessorsTest.py b/cortex-9.7.0/test/IECoreNuke/KnobAccessorsTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/KnobAccessorsTest.py rename to cortex-9.7.0/test/IECoreNuke/KnobAccessorsTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/KnobConvertersTest.py b/cortex-9.7.0/test/IECoreNuke/KnobConvertersTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/KnobConvertersTest.py rename to cortex-9.7.0/test/IECoreNuke/KnobConvertersTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/LensDistortTest.py b/cortex-9.7.0/test/IECoreNuke/LensDistortTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/LensDistortTest.py rename to cortex-9.7.0/test/IECoreNuke/LensDistortTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/ObjectKnobTest.py b/cortex-9.7.0/test/IECoreNuke/ObjectKnobTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/ObjectKnobTest.py rename to cortex-9.7.0/test/IECoreNuke/ObjectKnobTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/OpHolderTest.py b/cortex-9.7.0/test/IECoreNuke/OpHolderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/OpHolderTest.py rename to cortex-9.7.0/test/IECoreNuke/OpHolderTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/PNGReaderTest.py b/cortex-9.7.0/test/IECoreNuke/PNGReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/PNGReaderTest.py rename to cortex-9.7.0/test/IECoreNuke/PNGReaderTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/ParameterisedHolderTest.py b/cortex-9.7.0/test/IECoreNuke/ParameterisedHolderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/ParameterisedHolderTest.py rename to cortex-9.7.0/test/IECoreNuke/ParameterisedHolderTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/SceneCacheReaderTest.py b/cortex-9.7.0/test/IECoreNuke/SceneCacheReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/SceneCacheReaderTest.py rename to cortex-9.7.0/test/IECoreNuke/SceneCacheReaderTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/StringUtilTest.py b/cortex-9.7.0/test/IECoreNuke/StringUtilTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/StringUtilTest.py rename to cortex-9.7.0/test/IECoreNuke/StringUtilTest.py diff --git a/cortex-9.6.0/test/IECoreNuke/ops/add/add-1.py b/cortex-9.7.0/test/IECoreNuke/ops/add/add-1.py similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/ops/add/add-1.py rename to cortex-9.7.0/test/IECoreNuke/ops/add/add-1.py diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/animatedSpheres.scc b/cortex-9.7.0/test/IECoreNuke/scripts/animatedSpheres.scc similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/animatedSpheres.scc rename to cortex-9.7.0/test/IECoreNuke/scripts/animatedSpheres.scc diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr b/cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr rename to cortex-9.7.0/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr diff --git a/cortex-9.6.0/test/IECoreNuke/scripts/sceneCacheTest.nk b/cortex-9.7.0/test/IECoreNuke/scripts/sceneCacheTest.nk similarity index 100% rename from cortex-9.6.0/test/IECoreNuke/scripts/sceneCacheTest.nk rename to cortex-9.7.0/test/IECoreNuke/scripts/sceneCacheTest.nk diff --git a/cortex-9.6.0/test/IECoreRI/All.py b/cortex-9.7.0/test/IECoreRI/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/All.py rename to cortex-9.7.0/test/IECoreRI/All.py diff --git a/cortex-9.6.0/test/IECoreRI/ArchiveRecord.py b/cortex-9.7.0/test/IECoreRI/ArchiveRecord.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/ArchiveRecord.py rename to cortex-9.7.0/test/IECoreRI/ArchiveRecord.py diff --git a/cortex-9.6.0/test/IECoreRI/ArrayPrimVarTest.py b/cortex-9.7.0/test/IECoreRI/ArrayPrimVarTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/ArrayPrimVarTest.py rename to cortex-9.7.0/test/IECoreRI/ArrayPrimVarTest.py diff --git a/cortex-9.6.0/test/IECoreRI/Camera.py b/cortex-9.7.0/test/IECoreRI/Camera.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/Camera.py rename to cortex-9.7.0/test/IECoreRI/Camera.py diff --git a/cortex-9.6.0/test/IECoreRI/CoordinateSystemTest.py b/cortex-9.7.0/test/IECoreRI/CoordinateSystemTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/CoordinateSystemTest.py rename to cortex-9.7.0/test/IECoreRI/CoordinateSystemTest.py diff --git a/cortex-9.6.0/test/IECoreRI/CoshaderTest.py b/cortex-9.7.0/test/IECoreRI/CoshaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/CoshaderTest.py rename to cortex-9.7.0/test/IECoreRI/CoshaderTest.py diff --git a/cortex-9.6.0/test/IECoreRI/CurvesTest.py b/cortex-9.7.0/test/IECoreRI/CurvesTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/CurvesTest.py rename to cortex-9.7.0/test/IECoreRI/CurvesTest.py diff --git a/cortex-9.6.0/test/IECoreRI/DTEXDeepImageReaderTest.py b/cortex-9.7.0/test/IECoreRI/DTEXDeepImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/DTEXDeepImageReaderTest.py rename to cortex-9.7.0/test/IECoreRI/DTEXDeepImageReaderTest.py diff --git a/cortex-9.6.0/test/IECoreRI/DTEXDeepImageWriterTest.py b/cortex-9.7.0/test/IECoreRI/DTEXDeepImageWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/DTEXDeepImageWriterTest.py rename to cortex-9.7.0/test/IECoreRI/DTEXDeepImageWriterTest.py diff --git a/cortex-9.6.0/test/IECoreRI/DetailTest.py b/cortex-9.7.0/test/IECoreRI/DetailTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/DetailTest.py rename to cortex-9.7.0/test/IECoreRI/DetailTest.py diff --git a/cortex-9.6.0/test/IECoreRI/DoubleSided.py b/cortex-9.7.0/test/IECoreRI/DoubleSided.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/DoubleSided.py rename to cortex-9.7.0/test/IECoreRI/DoubleSided.py diff --git a/cortex-9.6.0/test/IECoreRI/DspyTest.py b/cortex-9.7.0/test/IECoreRI/DspyTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/DspyTest.py rename to cortex-9.7.0/test/IECoreRI/DspyTest.py diff --git a/cortex-9.6.0/test/IECoreRI/GXEvaluatorTest.py b/cortex-9.7.0/test/IECoreRI/GXEvaluatorTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/GXEvaluatorTest.py rename to cortex-9.7.0/test/IECoreRI/GXEvaluatorTest.py diff --git a/cortex-9.6.0/test/IECoreRI/GroupTest.py b/cortex-9.7.0/test/IECoreRI/GroupTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/GroupTest.py rename to cortex-9.7.0/test/IECoreRI/GroupTest.py diff --git a/cortex-9.6.0/test/IECoreRI/IlluminateTest.py b/cortex-9.7.0/test/IECoreRI/IlluminateTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/IlluminateTest.py rename to cortex-9.7.0/test/IECoreRI/IlluminateTest.py diff --git a/cortex-9.6.0/test/IECoreRI/Instancing.py b/cortex-9.7.0/test/IECoreRI/Instancing.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/Instancing.py rename to cortex-9.7.0/test/IECoreRI/Instancing.py diff --git a/cortex-9.6.0/test/IECoreRI/MotionTest.py b/cortex-9.7.0/test/IECoreRI/MotionTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/MotionTest.py rename to cortex-9.7.0/test/IECoreRI/MotionTest.py diff --git a/cortex-9.6.0/test/IECoreRI/MultipleContextsTest.py b/cortex-9.7.0/test/IECoreRI/MultipleContextsTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/MultipleContextsTest.py rename to cortex-9.7.0/test/IECoreRI/MultipleContextsTest.py diff --git a/cortex-9.6.0/test/IECoreRI/Orientation.py b/cortex-9.7.0/test/IECoreRI/Orientation.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/Orientation.py rename to cortex-9.7.0/test/IECoreRI/Orientation.py diff --git a/cortex-9.6.0/test/IECoreRI/PTCParticleReader.py b/cortex-9.7.0/test/IECoreRI/PTCParticleReader.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/PTCParticleReader.py rename to cortex-9.7.0/test/IECoreRI/PTCParticleReader.py diff --git a/cortex-9.6.0/test/IECoreRI/PTCParticleWriter.py b/cortex-9.7.0/test/IECoreRI/PTCParticleWriter.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/PTCParticleWriter.py rename to cortex-9.7.0/test/IECoreRI/PTCParticleWriter.py diff --git a/cortex-9.6.0/test/IECoreRI/ParameterisedProcedural.py b/cortex-9.7.0/test/IECoreRI/ParameterisedProcedural.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/ParameterisedProcedural.py rename to cortex-9.7.0/test/IECoreRI/ParameterisedProcedural.py diff --git a/cortex-9.6.0/test/IECoreRI/PatchMeshTest.py b/cortex-9.7.0/test/IECoreRI/PatchMeshTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/PatchMeshTest.py rename to cortex-9.7.0/test/IECoreRI/PatchMeshTest.py diff --git a/cortex-9.6.0/test/IECoreRI/PrimVarInterpretationTest.py b/cortex-9.7.0/test/IECoreRI/PrimVarInterpretationTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/PrimVarInterpretationTest.py rename to cortex-9.7.0/test/IECoreRI/PrimVarInterpretationTest.py diff --git a/cortex-9.6.0/test/IECoreRI/ProceduralThreadingTest.py b/cortex-9.7.0/test/IECoreRI/ProceduralThreadingTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/ProceduralThreadingTest.py rename to cortex-9.7.0/test/IECoreRI/ProceduralThreadingTest.py diff --git a/cortex-9.6.0/test/IECoreRI/PythonProceduralTest.py b/cortex-9.7.0/test/IECoreRI/PythonProceduralTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/PythonProceduralTest.py rename to cortex-9.7.0/test/IECoreRI/PythonProceduralTest.py diff --git a/cortex-9.6.0/test/IECoreRI/RIBWriterTest.py b/cortex-9.7.0/test/IECoreRI/RIBWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/RIBWriterTest.py rename to cortex-9.7.0/test/IECoreRI/RIBWriterTest.py diff --git a/cortex-9.6.0/test/IECoreRI/Renderer.py b/cortex-9.7.0/test/IECoreRI/Renderer.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/Renderer.py rename to cortex-9.7.0/test/IECoreRI/Renderer.py diff --git a/cortex-9.6.0/test/IECoreRI/RerenderingTest.py b/cortex-9.7.0/test/IECoreRI/RerenderingTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/RerenderingTest.py rename to cortex-9.7.0/test/IECoreRI/RerenderingTest.py diff --git a/cortex-9.6.0/test/IECoreRI/SHWDeepImageReaderTest.py b/cortex-9.7.0/test/IECoreRI/SHWDeepImageReaderTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/SHWDeepImageReaderTest.py rename to cortex-9.7.0/test/IECoreRI/SHWDeepImageReaderTest.py diff --git a/cortex-9.6.0/test/IECoreRI/SHWDeepImageWriterTest.py b/cortex-9.7.0/test/IECoreRI/SHWDeepImageWriterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/SHWDeepImageWriterTest.py rename to cortex-9.7.0/test/IECoreRI/SHWDeepImageWriterTest.py diff --git a/cortex-9.6.0/test/IECoreRI/SLOReader.py b/cortex-9.7.0/test/IECoreRI/SLOReader.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/SLOReader.py rename to cortex-9.7.0/test/IECoreRI/SLOReader.py diff --git a/cortex-9.6.0/test/IECoreRI/SXRendererTest.py b/cortex-9.7.0/test/IECoreRI/SXRendererTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/SXRendererTest.py rename to cortex-9.7.0/test/IECoreRI/SXRendererTest.py diff --git a/cortex-9.6.0/test/IECoreRI/StringArrayParameterTest.py b/cortex-9.7.0/test/IECoreRI/StringArrayParameterTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/StringArrayParameterTest.py rename to cortex-9.7.0/test/IECoreRI/StringArrayParameterTest.py diff --git a/cortex-9.6.0/test/IECoreRI/SubsurfaceTest.py b/cortex-9.7.0/test/IECoreRI/SubsurfaceTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/SubsurfaceTest.py rename to cortex-9.7.0/test/IECoreRI/SubsurfaceTest.py diff --git a/cortex-9.6.0/test/IECoreRI/TextTest.py b/cortex-9.7.0/test/IECoreRI/TextTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/TextTest.py rename to cortex-9.7.0/test/IECoreRI/TextTest.py diff --git a/cortex-9.6.0/test/IECoreRI/TextureOrientationTest.py b/cortex-9.7.0/test/IECoreRI/TextureOrientationTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreRI/TextureOrientationTest.py rename to cortex-9.7.0/test/IECoreRI/TextureOrientationTest.py diff --git a/cortex-9.6.0/test/IECoreRI/data/cube.ptc b/cortex-9.7.0/test/IECoreRI/data/cube.ptc similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/cube.ptc rename to cortex-9.7.0/test/IECoreRI/data/cube.ptc diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/bSpline.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/bSpline.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/bSpline.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/bSpline.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/bSplinePeriodic.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/bSplinePeriodic.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/bSplinePeriodic.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/bSplinePeriodic.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/bezier.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/bezier.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/bezier.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/bezier.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/linear.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/linear.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/linear.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/linear.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/linearPeriodic.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/linearPeriodic.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/linearPeriodic.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/linearPeriodic.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/curveImages/motionBlur.tif b/cortex-9.7.0/test/IECoreRI/data/curveImages/motionBlur.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/curveImages/motionBlur.tif rename to cortex-9.7.0/test/IECoreRI/data/curveImages/motionBlur.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/dtex/coneAndSphere.dtex b/cortex-9.7.0/test/IECoreRI/data/dtex/coneAndSphere.dtex similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/dtex/coneAndSphere.dtex rename to cortex-9.7.0/test/IECoreRI/data/dtex/coneAndSphere.dtex diff --git a/cortex-9.6.0/test/IECoreRI/data/dtex/coneAndSphere.exr b/cortex-9.7.0/test/IECoreRI/data/dtex/coneAndSphere.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/dtex/coneAndSphere.exr rename to cortex-9.7.0/test/IECoreRI/data/dtex/coneAndSphere.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr b/cortex-9.7.0/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr rename to cortex-9.7.0/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/exr/primitives.exr b/cortex-9.7.0/test/IECoreRI/data/exr/primitives.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/exr/primitives.exr rename to cortex-9.7.0/test/IECoreRI/data/exr/primitives.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/gxProblemMesh.cob b/cortex-9.7.0/test/IECoreRI/data/gxProblemMesh.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/gxProblemMesh.cob rename to cortex-9.7.0/test/IECoreRI/data/gxProblemMesh.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/gxProblemSeeds.cob b/cortex-9.7.0/test/IECoreRI/data/gxProblemSeeds.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/gxProblemSeeds.cob rename to cortex-9.7.0/test/IECoreRI/data/gxProblemSeeds.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/gxSubdivCube.cob b/cortex-9.7.0/test/IECoreRI/data/gxSubdivCube.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/gxSubdivCube.cob rename to cortex-9.7.0/test/IECoreRI/data/gxSubdivCube.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/openSubDivCube.cob b/cortex-9.7.0/test/IECoreRI/data/openSubDivCube.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/openSubDivCube.cob rename to cortex-9.7.0/test/IECoreRI/data/openSubDivCube.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bSpline.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bSpline.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bSpline.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bSpline.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bezier.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bezier.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/bezier.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/bezier.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/linear.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/linear.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/linear.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/linear.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/patchMeshImages/motionBlur.tif b/cortex-9.7.0/test/IECoreRI/data/patchMeshImages/motionBlur.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/patchMeshImages/motionBlur.tif rename to cortex-9.7.0/test/IECoreRI/data/patchMeshImages/motionBlur.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/coneAndSphere.shw b/cortex-9.7.0/test/IECoreRI/data/shw/coneAndSphere.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/coneAndSphere.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/coneAndSphere.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/constantPlane.shw b/cortex-9.7.0/test/IECoreRI/data/shw/constantPlane.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/constantPlane.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/constantPlane.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/constantPlane2.shw b/cortex-9.7.0/test/IECoreRI/data/shw/constantPlane2.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/constantPlane2.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/constantPlane2.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/constantPlaneOrtho.shw b/cortex-9.7.0/test/IECoreRI/data/shw/constantPlaneOrtho.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/constantPlaneOrtho.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/constantPlaneOrtho.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/groundPlane.exr b/cortex-9.7.0/test/IECoreRI/data/shw/groundPlane.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/groundPlane.exr rename to cortex-9.7.0/test/IECoreRI/data/shw/groundPlane.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/primitives.shw b/cortex-9.7.0/test/IECoreRI/data/shw/primitives.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/primitives.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/primitives.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/shw/translucentBoxes.shw b/cortex-9.7.0/test/IECoreRI/data/shw/translucentBoxes.shw similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/shw/translucentBoxes.shw rename to cortex-9.7.0/test/IECoreRI/data/shw/translucentBoxes.shw diff --git a/cortex-9.6.0/test/IECoreRI/data/sphere.cob b/cortex-9.7.0/test/IECoreRI/data/sphere.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sphere.cob rename to cortex-9.7.0/test/IECoreRI/data/sphere.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/stringPrimVars.cob b/cortex-9.7.0/test/IECoreRI/data/stringPrimVars.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/stringPrimVars.cob rename to cortex-9.7.0/test/IECoreRI/data/stringPrimVars.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxInput/cowI.exr b/cortex-9.7.0/test/IECoreRI/data/sxInput/cowI.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxInput/cowI.exr rename to cortex-9.7.0/test/IECoreRI/data/sxInput/cowI.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/sxInput/cowN.exr b/cortex-9.7.0/test/IECoreRI/data/sxInput/cowN.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxInput/cowN.exr rename to cortex-9.7.0/test/IECoreRI/data/sxInput/cowN.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/sxInput/cowP.exr b/cortex-9.7.0/test/IECoreRI/data/sxInput/cowP.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxInput/cowP.exr rename to cortex-9.7.0/test/IECoreRI/data/sxInput/cowP.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/coshaders.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/coshaders.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/coshaders.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/coshaders.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/cowCI.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/cowCI.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/cowCI.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/cowCI.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/cowColor.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/cowColor.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/cowColor.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/cowColor.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/cowFloat.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/cowFloat.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/cowFloat.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/cowFloat.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/cowOI.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/cowOI.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/cowOI.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/cowOI.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/grid.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/grid.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/grid.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/grid.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/noGrid.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/noGrid.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/noGrid.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/noGrid.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/shadePlaneImage.exr b/cortex-9.7.0/test/IECoreRI/data/sxOutput/shadePlaneImage.exr similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/shadePlaneImage.exr rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/shadePlaneImage.exr diff --git a/cortex-9.6.0/test/IECoreRI/data/sxOutput/spline.cob b/cortex-9.7.0/test/IECoreRI/data/sxOutput/spline.cob similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/sxOutput/spline.cob rename to cortex-9.7.0/test/IECoreRI/data/sxOutput/spline.cob diff --git a/cortex-9.6.0/test/IECoreRI/data/test.3Dbake b/cortex-9.7.0/test/IECoreRI/data/test.3Dbake similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/test.3Dbake rename to cortex-9.7.0/test/IECoreRI/data/test.3Dbake diff --git a/cortex-9.6.0/test/IECoreRI/data/testProceduralThreading.tif b/cortex-9.7.0/test/IECoreRI/data/testProceduralThreading.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/testProceduralThreading.tif rename to cortex-9.7.0/test/IECoreRI/data/testProceduralThreading.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/testPythonProcedural.tif b/cortex-9.7.0/test/IECoreRI/data/testPythonProcedural.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/testPythonProcedural.tif rename to cortex-9.7.0/test/IECoreRI/data/testPythonProcedural.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/textImages/helloWorld.tif b/cortex-9.7.0/test/IECoreRI/data/textImages/helloWorld.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/textImages/helloWorld.tif rename to cortex-9.7.0/test/IECoreRI/data/textImages/helloWorld.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/textureOrientationImages/expected.tif b/cortex-9.7.0/test/IECoreRI/data/textureOrientationImages/expected.tif similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/textureOrientationImages/expected.tif rename to cortex-9.7.0/test/IECoreRI/data/textureOrientationImages/expected.tif diff --git a/cortex-9.6.0/test/IECoreRI/data/textures/uvMap.256x256.tdl b/cortex-9.7.0/test/IECoreRI/data/textures/uvMap.256x256.tdl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/data/textures/uvMap.256x256.tdl rename to cortex-9.7.0/test/IECoreRI/data/textures/uvMap.256x256.tdl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/coshaderTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/coshaderTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/coshaderTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/coshaderTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/splineTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/splineTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/splineTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/splineTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxCoordSystemTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxCoordSystemTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxCoordSystemTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxCoordSystemTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxCoshaderTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxCoshaderTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxCoshaderTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxCoshaderTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxCoshaderTestMain.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxCoshaderTestMain.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxCoshaderTestMain.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxCoshaderTestMain.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxDisplacementTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxDisplacementTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxDisplacementTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxDisplacementTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxGetShaderTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxGetShaderTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxGetShaderTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxGetShaderTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxGetShaderTestMain.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxGetShaderTestMain.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxGetShaderTestMain.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxGetShaderTestMain.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxGetVarTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxGetVarTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxGetVarTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxGetVarTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxGridTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxGridTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxGridTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxGridTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxIlluminanceTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxIlluminanceTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxIlluminanceTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxIlluminanceTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxLightTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxLightTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxLightTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxLightTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxParameterTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxParameterTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxParameterTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxParameterTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxStTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxStTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxStTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxStTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxStackTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxStackTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxStackTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxStackTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxStringArrayOptionTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxStringArrayOptionTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxStringArrayOptionTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxStringArrayOptionTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxTextureTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxTextureTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxTextureTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxTextureTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/sxUserOptionTest.sl b/cortex-9.7.0/test/IECoreRI/shaders/sxUserOptionTest.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/sxUserOptionTest.sl rename to cortex-9.7.0/test/IECoreRI/shaders/sxUserOptionTest.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/tex.sl b/cortex-9.7.0/test/IECoreRI/shaders/tex.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/tex.sl rename to cortex-9.7.0/test/IECoreRI/shaders/tex.sl diff --git a/cortex-9.6.0/test/IECoreRI/shaders/types.sl b/cortex-9.7.0/test/IECoreRI/shaders/types.sl similarity index 100% rename from cortex-9.6.0/test/IECoreRI/shaders/types.sl rename to cortex-9.7.0/test/IECoreRI/shaders/types.sl diff --git a/cortex-9.6.0/test/IECoreTruelight/All.py b/cortex-9.7.0/test/IECoreTruelight/All.py similarity index 100% rename from cortex-9.6.0/test/IECoreTruelight/All.py rename to cortex-9.7.0/test/IECoreTruelight/All.py diff --git a/cortex-9.6.0/test/IECoreTruelight/TruelightColorTransformOpTest.py b/cortex-9.7.0/test/IECoreTruelight/TruelightColorTransformOpTest.py similarity index 100% rename from cortex-9.6.0/test/IECoreTruelight/TruelightColorTransformOpTest.py rename to cortex-9.7.0/test/IECoreTruelight/TruelightColorTransformOpTest.py diff --git a/cortex-9.6.0/test/IECoreTruelight/data/alphachannelFAIL.tiff b/cortex-9.7.0/test/IECoreTruelight/data/alphachannelFAIL.tiff similarity index 100% rename from cortex-9.6.0/test/IECoreTruelight/data/alphachannelFAIL.tiff rename to cortex-9.7.0/test/IECoreTruelight/data/alphachannelFAIL.tiff