diff --git a/cortex-9.0.0-a6/.gitignore b/cortex-9.0.0-a10/.gitignore similarity index 100% rename from cortex-9.0.0-a6/.gitignore rename to cortex-9.0.0-a10/.gitignore diff --git a/cortex-9.0.0-a6/Changes b/cortex-9.0.0-a10/Changes similarity index 97% rename from cortex-9.0.0-a6/Changes rename to cortex-9.0.0-a10/Changes index 0c68552f08..5407a10dc3 100644 --- a/cortex-9.0.0-a6/Changes +++ b/cortex-9.0.0-a10/Changes @@ -1,3 +1,83 @@ +# 9.0.0-a10 + +#### IECore + +- Fixed GIL bug in python Object creation +- Added implementation of tbb_hasher for boost::intrusive_ptr + +#### IECoreGL + +- Added State::ScopedBinding overload, allowing a binding to be ignored +- Changed IECoreGL::HitRecord::name field from InternedString to GLuint +- Added IECoreGL::Selector::loadName() overload to auto-generates names +- Removed TextureUnits.h +- Added python bindings for CurvesPrimitive +- Added python bindings for smoothing state components +- Added ToGLStateConverter for converting attributes to State objects +- Fixed crash in ShaderStateComponent::addParametersToShaderSetup() + +#### Incompatibilities + +- Changed IECoreGL::HitRecord members +- Removed IECoreGL/TextureUnits.h + +#### Build + +- Fixed compilation for GCC 4.2 on OS X + +# 9.0.0-a9 + +#### IECore + +- TIFFImageReader now checks if the tif is tagged as coming from tdlmake, and if so, sets the sourceColorSpace from the image description set by tdlmake. + +#### IECoreGL + +- Switched glsl diffuse and specular functions to match 3delight's properly normalized BRDFS + +#### IECoreMaya + +- Fixed coordinate system->maya locator converter crash for coordinate system with no transform +- Fixed crash in SceneShape::hasSceneShapeObject for invalid scene + +#### IECoreRI + +- Automatic instancing now defaults to on + +# 9.0.0-a8 + +#### IECoreMaya + +- Stopped IECoreMaya::LiveScene::readObject() returning null pointers. +- Stopped IECoreMaya::LiveScene::readAttribute() returning null pointers. + +#### IECoreRI + +- Fixed precision issue with computing the projection matrix for dsm depth remapping, which was causing deep holdout problems. +- Fixed bug when editing cameras when dealing with multiple cameras. + +# 9.0.0-a7 + +#### IECore + +- Reduced overhead of calling memoryUsage() on SimpleTypedData. +- Added pixelAspectRatio to list of standard camera parameters. +- Added InternedString( const char *, size_t length ) constructor. + +#### IECoreRI + +- Added pixel aspect ratio support to IECoreRI::Renderer. +- Fixed argument passing for RiProcDynamicLoad. + +#### IECoreArnold + +- Added pixel aspect ratio support to IECoreArnold::Renderer. + +#### IECoreHoudini + +- ToHoudiniGeometryConverter marks Pref and rest as non-transforming +- Preventing SceneCache Source from transforming rest/Pref + # 9.0.0-a6 #### IECore diff --git a/cortex-9.0.0-a6/LICENSE b/cortex-9.0.0-a10/LICENSE similarity index 100% rename from cortex-9.0.0-a6/LICENSE rename to cortex-9.0.0-a10/LICENSE diff --git a/cortex-9.0.0-a6/README.asciidoc b/cortex-9.0.0-a10/README.asciidoc similarity index 100% rename from cortex-9.0.0-a6/README.asciidoc rename to cortex-9.0.0-a10/README.asciidoc diff --git a/cortex-9.0.0-a6/SConstruct b/cortex-9.0.0-a10/SConstruct similarity index 99% rename from cortex-9.0.0-a6/SConstruct rename to cortex-9.0.0-a10/SConstruct index 63ad2be6ae..5881d33c23 100644 --- a/cortex-9.0.0-a6/SConstruct +++ b/cortex-9.0.0-a10/SConstruct @@ -53,7 +53,7 @@ SConsignFile() ieCoreMajorVersion=9 ieCoreMinorVersion=0 ieCorePatchVersion=0 -ieCoreVersionSuffix="a6" # used for alpha/beta releases. Example: "a1", "b2", etc. +ieCoreVersionSuffix="a10" # used for alpha/beta releases. Example: "a1", "b2", etc. ########################################################################################### # Command line options @@ -748,7 +748,6 @@ o.Add( ( "IECore.MeshNormalsOp", "common/primitive/mesh/addNormals" ), ( "IECore.MeshTangentsOp", "common/primitive/mesh/addTangents" ), ( "IECore.MeshMergeOp", "common/primitive/mesh/merge" ), - ( "IECore.MeshPrimitiveImplicitSurfaceOp", "common/primitive/mesh/implicitSurface" ), ( "IECore.MeshVertexReorderOp", "common/primitive/mesh/vertexReorder" ), ( "IECore.MeshPrimitiveShrinkWrapOp", "common/primitive/mesh/shrinkWrap" ), ( "IECore.MeshDistortionsOp", "common/primitive/mesh/calculateDistortions" ), diff --git a/cortex-9.0.0-a6/config/ie/buildAll b/cortex-9.0.0-a10/config/ie/buildAll similarity index 100% rename from cortex-9.0.0-a6/config/ie/buildAll rename to cortex-9.0.0-a10/config/ie/buildAll diff --git a/cortex-9.0.0-a6/config/ie/options b/cortex-9.0.0-a10/config/ie/options similarity index 100% rename from cortex-9.0.0-a6/config/ie/options rename to cortex-9.0.0-a10/config/ie/options diff --git a/cortex-9.0.0-a6/config/ie/postCoreHoudiniInstall b/cortex-9.0.0-a10/config/ie/postCoreHoudiniInstall similarity index 100% rename from cortex-9.0.0-a6/config/ie/postCoreHoudiniInstall rename to cortex-9.0.0-a10/config/ie/postCoreHoudiniInstall diff --git a/cortex-9.0.0-a6/config/ie/postCoreMayaInstall b/cortex-9.0.0-a10/config/ie/postCoreMayaInstall similarity index 100% rename from cortex-9.0.0-a6/config/ie/postCoreMayaInstall rename to cortex-9.0.0-a10/config/ie/postCoreMayaInstall diff --git a/cortex-9.0.0-a6/config/ie/valgrindSuppressions b/cortex-9.0.0-a10/config/ie/valgrindSuppressions similarity index 100% rename from cortex-9.0.0-a6/config/ie/valgrindSuppressions rename to cortex-9.0.0-a10/config/ie/valgrindSuppressions diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.inl diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h b/cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h rename to cortex-9.0.0-a10/contrib/IECoreAlembic/include/IECoreAlembic/bindings/AlembicInputBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/ABCToMDC.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/AlembicProcedural.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/python/IECoreAlembic/__init__.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicCameraConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicGeomBaseConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicPolyMeshConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicSubDConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/FromAlembicXFormConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/bindings/AlembicInputBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreAlembic/src/IECoreAlembic/bindings/IECoreAlembicBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/ABCToMDCTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/All.py b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/All.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/All.py rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/All.py diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/animatedCube.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/coloredMesh.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/cube.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/noTopLevelStoredBounds.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/rotatingCube.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc b/cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc rename to cortex-9.0.0-a10/contrib/IECoreAlembic/test/IECoreAlembic/data/subdPlane.abc diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/Renderer.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/Renderer.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/Renderer.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/Renderer.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCameraConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldConverter.inl diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldCurvesConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldMeshConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldPointsConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/ToArnoldShapeConverter.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/TypeIds.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/UniverseBlock.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/InstancingConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/RendererBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldMeshConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldPointsConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/ToArnoldShapeConverterBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/bindings/UniverseBlockBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h b/cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h rename to cortex-9.0.0-a10/contrib/IECoreArnold/include/IECoreArnold/private/RendererImplementation.h diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py b/cortex-9.0.0-a10/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/python/IECoreArnold/UniverseBlock.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/python/IECoreArnold/__init__.py b/cortex-9.0.0-a10/contrib/IECoreArnold/python/IECoreArnold/__init__.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/python/IECoreArnold/__init__.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/python/IECoreArnold/__init__.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/InstancingConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/Renderer.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp similarity index 98% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp index ad83778dee..937e57cd93 100644 --- a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp +++ b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/RendererImplementation.cpp @@ -208,6 +208,8 @@ IECore::ConstDataPtr IECoreArnold::RendererImplementation::getOption( const std: void IECoreArnold::RendererImplementation::camera( const std::string &name, const IECore::CompoundDataMap ¶meters ) { CameraPtr cortexCamera = new Camera( name, 0, new CompoundData( parameters ) ); + cortexCamera->addStandardParameters(); + ToArnoldCameraConverterPtr converter = new ToArnoldCameraConverter( cortexCamera ); AtNode *arnoldCamera = converter->convert(); AtNode *options = AiUniverseGetOptions(); @@ -215,9 +217,12 @@ void IECoreArnold::RendererImplementation::camera( const std::string &name, cons applyTransformToNode( arnoldCamera ); - ConstV2iDataPtr resolution = cortexCamera->parametersData()->member( "resolution" ); - AiNodeSetInt( options, "xres", resolution ? resolution->readable().x : 640 ); - AiNodeSetInt( options, "yres", resolution ? resolution->readable().y : 480 ); + const V2iData *resolution = cortexCamera->parametersData()->member( "resolution" ); + AiNodeSetInt( options, "xres", resolution->readable().x ); + AiNodeSetInt( options, "yres", resolution->readable().y ); + + const FloatData *pixelAspectRatio = cortexCamera->parametersData()->member( "pixelAspectRatio" ); + AiNodeSetFlt( options, "aspect_ratio", 1.0f / pixelAspectRatio->readable() ); // arnold is y/x, we're x/y } void IECoreArnold::RendererImplementation::display( const std::string &name, const std::string &type, const std::string &data, const IECore::CompoundDataMap ¶meters ) diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp similarity index 95% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp index ec65229c34..28dc6ea702 100644 --- a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp +++ b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCameraConverter.cpp @@ -94,7 +94,8 @@ AtNode *ToArnoldCameraConverter::doConversion( IECore::ConstObjectPtr from, IECo // set screen window const Imath::Box2f &screenWindow = camera->parametersData()->member( "screenWindow", true )->readable(); const Imath::V2i &resolution = camera->parametersData()->member( "resolution", true )->readable(); - float aspect = (float)resolution.x / (float)resolution.y; + const float pixelAspectRatio = camera->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 ); diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldCurvesConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldMeshConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldPointsConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/ToArnoldShapeConverter.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/UniverseBlock.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/IECoreArnoldBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/InstancingConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/RendererBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldCurvesConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldMeshConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldPointsConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/ToArnoldShapeConverterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/bindings/UniverseBlockBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/mtoaExtension/ProceduralHolderTranslator.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/outputDriver/OutputDriver.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/outputDriver/OutputDriver.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/outputDriver/OutputDriver.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/outputDriver/OutputDriver.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp b/cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp rename to cortex-9.0.0-a10/contrib/IECoreArnold/src/IECoreArnold/procedural/Procedural.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/All.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/All.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/All.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/All.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/AutomaticInstancingTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/InstancingConverterTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/MeshTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/OutputDriverTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/PointsTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ProceduralDSOTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ProceduralTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py similarity index 98% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py index 14950eb0df..230d519df2 100644 --- a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py +++ b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/RendererTest.py @@ -705,9 +705,7 @@ def testExternalProcedural( self ) : ) ) - ass = "".join( file( self.__assFileName ).readlines() ) - print ass self.assertTrue( "procedural" in ass ) self.assertTrue( "min 1 2 3" in ass ) @@ -722,6 +720,18 @@ def testExternalProcedural( self ) : self.assertTrue( "intParm 2" in ass ) self.assertTrue( "colorParm 1 2 3" in ass ) + def testPixelAspectRatio( self ) : + + r = IECoreArnold.Renderer( self.__assFileName ) + + r.camera( "main", { "resolution" : IECore.V2i( 640, 480 ), "pixelAspectRatio" : 2.0 } ) + + with IECore.WorldBlock( r ) : + pass + + ass = "".join( file( self.__assFileName ).readlines() ) + self.assertTrue( "aspect_ratio 0.5" in ass ) + def tearDown( self ) : for f in [ diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/ToArnoldConverterTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/UniverseBlockTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/mergedDisplays.ass diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/proceduralDSO.ass diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/assFiles/vectorAndPointDisplays.ass diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bSpline.exr diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/curveImages/bezier.exr diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/meshImages/expectedMeshUVs.exr diff --git a/cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif b/cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif rename to cortex-9.0.0-a10/contrib/IECoreArnold/test/IECoreArnold/data/pointsImages/points.tif diff --git a/cortex-9.0.0-a6/contrib/IECoreHoudini/CMakeLists.txt b/cortex-9.0.0-a10/contrib/IECoreHoudini/CMakeLists.txt similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreHoudini/CMakeLists.txt rename to cortex-9.0.0-a10/contrib/IECoreHoudini/CMakeLists.txt diff --git a/cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindCortex.cmake b/cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindCortex.cmake similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindCortex.cmake rename to cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindCortex.cmake diff --git a/cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake b/cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake rename to cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindHoudini.cmake diff --git a/cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindTBB.cmake b/cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindTBB.cmake similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreHoudini/config/cmake/FindTBB.cmake rename to cortex-9.0.0-a10/contrib/IECoreHoudini/config/cmake/FindTBB.cmake diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h b/cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h rename to cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/ProceduralPrimitive.h diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/Renderer.h b/cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/Renderer.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/Renderer.h rename to cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/Renderer.h diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h b/cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h rename to cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/TypeIds.h diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h b/cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h rename to cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/bindings/RendererBinding.h diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h b/cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h rename to cortex-9.0.0-a10/contrib/IECoreMantra/include/IECoreMantra/private/RendererImplementation.h diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/INDEX__SECTION diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Sections.list diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.contents diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/.OPdummydefs diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.def diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.init diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.net diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.order diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1.userdata diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.chn diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.def diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.init diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.parm diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.spareparmdef diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/ieprocedural1.userdata diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.def diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.init diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.parm diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/cortexMantraInject1/suboutput1.userdata diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.dir/node_type diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Contents.gz diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/CreateScript diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/DialogScript diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/ExtraFileOptions diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Help diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Sections.list diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/Tools.shelf diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1cortexMantraInject/TypePropertiesOptions diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/CreateScript diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/DialogScript diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/ExtraFileOptions diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Help diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Sections.list diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/Tools.shelf diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions b/cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions rename to cortex-9.0.0-a10/contrib/IECoreMantra/otls/IECoreMantra/ieCoreMantra/Shop_1ieprocedural/TypePropertiesOptions diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/python/IECoreMantra/__init__.py b/cortex-9.0.0-a10/contrib/IECoreMantra/python/IECoreMantra/__init__.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/python/IECoreMantra/__init__.py rename to cortex-9.0.0-a10/contrib/IECoreMantra/python/IECoreMantra/__init__.py diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/ProceduralPrimitive.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/Renderer.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/RendererImplementation.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/bindings/IECoreMantraBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/bindings/RendererBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/Procedural.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/VRAYprocedural diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp b/cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp rename to cortex-9.0.0-a10/contrib/IECoreMantra/src/IECoreMantra/procedural/World.cpp diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/All.py b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/All.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/All.py rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/All.py diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/RendererTest.py diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/sphere.cob diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/testGeometry.tif diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/data/testWorldMesh.tif diff --git a/cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py b/cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py similarity index 100% rename from cortex-9.0.0-a6/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py rename to cortex-9.0.0-a10/contrib/IECoreMantra/test/IECoreMantra/procedurals/sphereProcedural/sphereProcedural-1.py diff --git a/cortex-9.0.0-a6/contrib/for_review/MayaOp/publishCamera-1.py b/cortex-9.0.0-a10/contrib/for_review/MayaOp/publishCamera-1.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/MayaOp/publishCamera-1.py rename to cortex-9.0.0-a10/contrib/for_review/MayaOp/publishCamera-1.py diff --git a/cortex-9.0.0-a6/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py b/cortex-9.0.0-a10/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py rename to cortex-9.0.0-a10/contrib/for_review/ModifiedBasicPreset/python/IECore/BasicPreset.py diff --git a/cortex-9.0.0-a6/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py b/cortex-9.0.0-a10/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py rename to cortex-9.0.0-a10/contrib/for_review/ModifiedBasicPreset/test/IECore/BasicPreset.py diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/SkeletonPrimitive.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECore/TypeIds.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/ConePrimitive.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/JointPrimitive.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/SkeletonPrimitive.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/TypeIds.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECoreGL/bindings/JointPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/include/IECorePython/SkeletonPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/exportSkeletonFromMaya.py diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/__init__.py diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/py_SkeletonPrimitiveIO/skeletonPrimitivesUtilities/skeletonPrimitiveIO.py diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECore/SkeletonPrimitive.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/ConePrimitive.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/JointPrimitive.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/Renderer.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/SkeletonPrimitive.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECoreGL/bindings/JointPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/SkeletonPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePython/TypeIdBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/src/IECorePythonModule/IECore.cpp diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/All.py diff --git a/cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py b/cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py rename to cortex-9.0.0-a10/contrib/for_review/SkeletonPrimitive_DrD/test/IECore/SkeletonPrimitiveTest.py diff --git a/cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/SConstruct.patch b/cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/SConstruct.patch similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/SConstruct.patch rename to cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/SConstruct.patch diff --git a/cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/options-maya2011.txt b/cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/options-maya2011.txt similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/options-maya2011.txt rename to cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/options-maya2011.txt diff --git a/cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/readme.txt b/cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/readme.txt similarity index 100% rename from cortex-9.0.0-a6/contrib/for_review/build_configurations/osx/readme.txt rename to cortex-9.0.0-a10/contrib/for_review/build_configurations/osx/readme.txt diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BGEOParticleReader.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BINMeshReader.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/BINParticleWriter.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECore/IFFHairReader.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BGEOParticleReaderBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BINMeshReaderBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/BINParticleWriterBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/include/IECorePython/IFFHairReaderBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BGEOParticleReader.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BINMeshReader.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/BINParticleWriter.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECore/IFFHairReader.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BGEOParticleReaderBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BINMeshReaderBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/BINParticleWriterBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/src/IECorePython/IFFHairReaderBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BGEOParticleReader.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BINMeshReaderTest.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/BINParticleWriterTest.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/IFFHairReader.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0004.bgeo diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/bgeoFiles/particleTest.0006.bgeo diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/binFiles/mesh.bin diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/hairSystem.mchp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp b/cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp rename to cortex-9.0.0-a10/contrib/removedInCortex9/deadFormats/test/IECore/data/iffFiles/sparseHairSystem.mchp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/BlobbyImplicitSurfaceFunction.inl diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CSGImplicitSurfaceFunction.inl diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/CachedImplicitSurfaceFunction.inl diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubes.inl diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MarchingCubesBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/MeshPrimitiveImplicitSurfaceOp.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ParticleMeshOp.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PlaneImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PointMeshOp.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/PrimitiveImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/SphereImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECore/ZhuBridsonImplicitSurfaceFunction.inl diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/BlobbyImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CSGImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/CachedImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ParticleMeshOpBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PlaneImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PointMeshOpBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/SphereImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/include/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceFunction.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/MeshPrimitiveImplicitSurfaceOp.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/ParticleMeshOp.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/PointMeshOp.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECore/PrimitiveImplicitSurfaceFunction.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/BlobbyImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CSGImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/CachedImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MarchingCubesBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/MeshPrimitiveImplicitSurfaceOpBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ParticleMeshOpBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PlaneImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PointMeshOpBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/PrimitiveImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/SphereImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/src/IECorePython/ZhuBridsonImplicitSurfaceFunctionBinding.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/CSGImplicitSurfaceFunction.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/CachedImplicitSurfaceFunction.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/ImplicitSurfaceFunction.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubes.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.cpp diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MarchingCubesTest.h diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/MeshPrimitiveImplicitSurfaceOp.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/ParticleMeshOp.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/PointMeshOp.py diff --git a/cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py b/cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py similarity index 100% rename from cortex-9.0.0-a6/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py rename to cortex-9.0.0-a10/contrib/removedInCortex9/implicitSurfaces/test/IECore/PrimitiveImplicitSurfaceFunction.py diff --git a/cortex-9.0.0-a6/doc/config/Doxyfile b/cortex-9.0.0-a10/doc/config/Doxyfile similarity index 100% rename from cortex-9.0.0-a6/doc/config/Doxyfile rename to cortex-9.0.0-a10/doc/config/Doxyfile diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/ColorAlgo.h b/cortex-9.0.0-a10/glsl/IECoreGL/ColorAlgo.h similarity index 100% rename from cortex-9.0.0-a6/glsl/IECoreGL/ColorAlgo.h rename to cortex-9.0.0-a10/glsl/IECoreGL/ColorAlgo.h diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/CurvesPrimitive.h b/cortex-9.0.0-a10/glsl/IECoreGL/CurvesPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/glsl/IECoreGL/CurvesPrimitive.h rename to cortex-9.0.0-a10/glsl/IECoreGL/CurvesPrimitive.h diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/Diffuse.h b/cortex-9.0.0-a10/glsl/IECoreGL/Diffuse.h similarity index 92% rename from cortex-9.0.0-a6/glsl/IECoreGL/Diffuse.h rename to cortex-9.0.0-a10/glsl/IECoreGL/Diffuse.h index 61adc7fc5b..0028f418f8 100644 --- a/cortex-9.0.0-a6/glsl/IECoreGL/Diffuse.h +++ b/cortex-9.0.0-a10/glsl/IECoreGL/Diffuse.h @@ -35,12 +35,15 @@ #ifndef IECOREGL_DIFFUSE_H #define IECOREGL_DIFFUSE_H +#define M_PI 3.1415926535897932384626433832795 + vec3 ieDiffuse( vec3 P, vec3 N, vec3 Cl[gl_MaxLights], vec3 L[gl_MaxLights], int nLights ) { vec3 result = vec3( 0 ); + float normalization = 1.0 / M_PI; for( int i=0 ; i &IECoreGL::textureUnits() +#define M_PI 3.1415926535897932384626433832795 + +vec3 ieSpecular( vec3 P, vec3 N, vec3 V, float roughness, vec3 lightColors[gl_MaxLights], vec3 lightDirs[gl_MaxLights], int nLights ) { - static std::vector t; - if( !t.size() ) + float n = pow( roughness, -3.5 ) - 1; + + // Blinn normalization + float normalization = ( n + 2.0 ) / ( 4.0 * M_PI * (2.0 - pow( 2.0, -n * 0.5 ) ) ); + + // Combine the visibility term from the denominator of the microfacet BRDF with the normalization + normalization /= dot( N, V ); + + // We use Schlick's approximation to the Smith G masking/shadowing function + float k = 0.2 * roughness * sqrt( 2.0 / M_PI ); + + // Eye Component of G : The masking term + float G1V = max( 0, dot( N, V ) ) / ( dot( N, V ) * ( 1 - k ) + k ); + + + + + vec3 result = vec3( 0 ); + for( int i=0 ; i +/// May be used to detect the existence of the +/// InternedString( const char *, size_t length ) +/// constructor. +#define IECORE_INTERNEDSTRING_RANGECONSTRUCTOR + namespace IECore { @@ -53,6 +58,7 @@ class InternedString inline InternedString( const std::string &value ); inline InternedString( const InternedString &other ); inline InternedString( const char *value ); + inline InternedString( const char *value, size_t length ); inline InternedString( int64_t number ); inline ~InternedString(); @@ -81,6 +87,7 @@ class InternedString private : static const std::string *internedString( const char *value ); + static const std::string *internedString( const char *value, size_t length ); const std::string *m_value; diff --git a/cortex-9.0.0-a6/include/IECore/InternedString.inl b/cortex-9.0.0-a10/include/IECore/InternedString.inl similarity index 96% rename from cortex-9.0.0-a6/include/IECore/InternedString.inl rename to cortex-9.0.0-a10/include/IECore/InternedString.inl index 8456a8693e..7b70bec9c3 100644 --- a/cortex-9.0.0-a6/include/IECore/InternedString.inl +++ b/cortex-9.0.0-a10/include/IECore/InternedString.inl @@ -58,6 +58,11 @@ inline InternedString::InternedString( const char *value ) { } +inline InternedString::InternedString( const char *value, size_t length ) + : m_value( internedString( value, length ) ) +{ +} + inline InternedString::InternedString( int64_t number ) : m_value( numberString( number ).m_value ) { diff --git a/cortex-9.0.0-a6/include/IECore/InterpolatedCache.h b/cortex-9.0.0-a10/include/IECore/InterpolatedCache.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/InterpolatedCache.h rename to cortex-9.0.0-a10/include/IECore/InterpolatedCache.h diff --git a/cortex-9.0.0-a6/include/IECore/Interpolator.h b/cortex-9.0.0-a10/include/IECore/Interpolator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Interpolator.h rename to cortex-9.0.0-a10/include/IECore/Interpolator.h diff --git a/cortex-9.0.0-a6/include/IECore/Interpolator.inl b/cortex-9.0.0-a10/include/IECore/Interpolator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Interpolator.inl rename to cortex-9.0.0-a10/include/IECore/Interpolator.inl diff --git a/cortex-9.0.0-a6/include/IECore/InverseDistanceWeightedInterpolation.h b/cortex-9.0.0-a10/include/IECore/InverseDistanceWeightedInterpolation.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/InverseDistanceWeightedInterpolation.h rename to cortex-9.0.0-a10/include/IECore/InverseDistanceWeightedInterpolation.h diff --git a/cortex-9.0.0-a6/include/IECore/InverseDistanceWeightedInterpolation.inl b/cortex-9.0.0-a10/include/IECore/InverseDistanceWeightedInterpolation.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/InverseDistanceWeightedInterpolation.inl rename to cortex-9.0.0-a10/include/IECore/InverseDistanceWeightedInterpolation.inl diff --git a/cortex-9.0.0-a6/include/IECore/JPEGImageReader.h b/cortex-9.0.0-a10/include/IECore/JPEGImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/JPEGImageReader.h rename to cortex-9.0.0-a10/include/IECore/JPEGImageReader.h diff --git a/cortex-9.0.0-a6/include/IECore/JPEGImageWriter.h b/cortex-9.0.0-a10/include/IECore/JPEGImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/JPEGImageWriter.h rename to cortex-9.0.0-a10/include/IECore/JPEGImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/KDTree.h b/cortex-9.0.0-a10/include/IECore/KDTree.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/KDTree.h rename to cortex-9.0.0-a10/include/IECore/KDTree.h diff --git a/cortex-9.0.0-a6/include/IECore/KDTree.inl b/cortex-9.0.0-a10/include/IECore/KDTree.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/KDTree.inl rename to cortex-9.0.0-a10/include/IECore/KDTree.inl diff --git a/cortex-9.0.0-a6/include/IECore/LRUCache.h b/cortex-9.0.0-a10/include/IECore/LRUCache.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LRUCache.h rename to cortex-9.0.0-a10/include/IECore/LRUCache.h diff --git a/cortex-9.0.0-a6/include/IECore/LRUCache.inl b/cortex-9.0.0-a10/include/IECore/LRUCache.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LRUCache.inl rename to cortex-9.0.0-a10/include/IECore/LRUCache.inl diff --git a/cortex-9.0.0-a6/include/IECore/LensDistortOp.h b/cortex-9.0.0-a10/include/IECore/LensDistortOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LensDistortOp.h rename to cortex-9.0.0-a10/include/IECore/LensDistortOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LensModel.h b/cortex-9.0.0-a10/include/IECore/LensModel.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LensModel.h rename to cortex-9.0.0-a10/include/IECore/LensModel.h diff --git a/cortex-9.0.0-a6/include/IECore/LensModel.inl b/cortex-9.0.0-a10/include/IECore/LensModel.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LensModel.inl rename to cortex-9.0.0-a10/include/IECore/LensModel.inl diff --git a/cortex-9.0.0-a6/include/IECore/LevelFilteredMessageHandler.h b/cortex-9.0.0-a10/include/IECore/LevelFilteredMessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LevelFilteredMessageHandler.h rename to cortex-9.0.0-a10/include/IECore/LevelFilteredMessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECore/LevenbergMarquardt.h b/cortex-9.0.0-a10/include/IECore/LevenbergMarquardt.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LevenbergMarquardt.h rename to cortex-9.0.0-a10/include/IECore/LevenbergMarquardt.h diff --git a/cortex-9.0.0-a6/include/IECore/LevenbergMarquardt.inl b/cortex-9.0.0-a10/include/IECore/LevenbergMarquardt.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LevenbergMarquardt.inl rename to cortex-9.0.0-a10/include/IECore/LevenbergMarquardt.inl diff --git a/cortex-9.0.0-a6/include/IECore/Light.h b/cortex-9.0.0-a10/include/IECore/Light.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Light.h rename to cortex-9.0.0-a10/include/IECore/Light.h diff --git a/cortex-9.0.0-a6/include/IECore/LimitSmoothSkinningInfluencesOp.h b/cortex-9.0.0-a10/include/IECore/LimitSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LimitSmoothSkinningInfluencesOp.h rename to cortex-9.0.0-a10/include/IECore/LimitSmoothSkinningInfluencesOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LineSegment.h b/cortex-9.0.0-a10/include/IECore/LineSegment.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LineSegment.h rename to cortex-9.0.0-a10/include/IECore/LineSegment.h diff --git a/cortex-9.0.0-a6/include/IECore/LineSegment.inl b/cortex-9.0.0-a10/include/IECore/LineSegment.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LineSegment.inl rename to cortex-9.0.0-a10/include/IECore/LineSegment.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcDataConversion.h b/cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcDataConversion.h rename to cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcDataConversion.inl b/cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcOp.h b/cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToAlexaLogcOp.h rename to cortex-9.0.0-a10/include/IECore/LinearToAlexaLogcOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToCineonDataConversion.h b/cortex-9.0.0-a10/include/IECore/LinearToCineonDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToCineonDataConversion.h rename to cortex-9.0.0-a10/include/IECore/LinearToCineonDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToCineonDataConversion.inl b/cortex-9.0.0-a10/include/IECore/LinearToCineonDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToCineonDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/LinearToCineonDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToCineonOp.h b/cortex-9.0.0-a10/include/IECore/LinearToCineonOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToCineonOp.h rename to cortex-9.0.0-a10/include/IECore/LinearToCineonOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToPanalogDataConversion.h b/cortex-9.0.0-a10/include/IECore/LinearToPanalogDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToPanalogDataConversion.h rename to cortex-9.0.0-a10/include/IECore/LinearToPanalogDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToPanalogDataConversion.inl b/cortex-9.0.0-a10/include/IECore/LinearToPanalogDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToPanalogDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/LinearToPanalogDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToPanalogOp.h b/cortex-9.0.0-a10/include/IECore/LinearToPanalogOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToPanalogOp.h rename to cortex-9.0.0-a10/include/IECore/LinearToPanalogOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToRec709DataConversion.h b/cortex-9.0.0-a10/include/IECore/LinearToRec709DataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToRec709DataConversion.h rename to cortex-9.0.0-a10/include/IECore/LinearToRec709DataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToRec709DataConversion.inl b/cortex-9.0.0-a10/include/IECore/LinearToRec709DataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToRec709DataConversion.inl rename to cortex-9.0.0-a10/include/IECore/LinearToRec709DataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToRec709Op.h b/cortex-9.0.0-a10/include/IECore/LinearToRec709Op.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToRec709Op.h rename to cortex-9.0.0-a10/include/IECore/LinearToRec709Op.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToSRGBDataConversion.h b/cortex-9.0.0-a10/include/IECore/LinearToSRGBDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToSRGBDataConversion.h rename to cortex-9.0.0-a10/include/IECore/LinearToSRGBDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/LinearToSRGBDataConversion.inl b/cortex-9.0.0-a10/include/IECore/LinearToSRGBDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToSRGBDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/LinearToSRGBDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/LinearToSRGBOp.h b/cortex-9.0.0-a10/include/IECore/LinearToSRGBOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinearToSRGBOp.h rename to cortex-9.0.0-a10/include/IECore/LinearToSRGBOp.h diff --git a/cortex-9.0.0-a6/include/IECore/LinkedScene.h b/cortex-9.0.0-a10/include/IECore/LinkedScene.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LinkedScene.h rename to cortex-9.0.0-a10/include/IECore/LinkedScene.h diff --git a/cortex-9.0.0-a6/include/IECore/Lookup.h b/cortex-9.0.0-a10/include/IECore/Lookup.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Lookup.h rename to cortex-9.0.0-a10/include/IECore/Lookup.h diff --git a/cortex-9.0.0-a6/include/IECore/Lookup.inl b/cortex-9.0.0-a10/include/IECore/Lookup.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Lookup.inl rename to cortex-9.0.0-a10/include/IECore/Lookup.inl diff --git a/cortex-9.0.0-a6/include/IECore/LuminanceOp.h b/cortex-9.0.0-a10/include/IECore/LuminanceOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/LuminanceOp.h rename to cortex-9.0.0-a10/include/IECore/LuminanceOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MPlayDisplayDriver.h b/cortex-9.0.0-a10/include/IECore/MPlayDisplayDriver.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MPlayDisplayDriver.h rename to cortex-9.0.0-a10/include/IECore/MPlayDisplayDriver.h diff --git a/cortex-9.0.0-a6/include/IECore/MappedRandomPointDistributionOp.h b/cortex-9.0.0-a10/include/IECore/MappedRandomPointDistributionOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MappedRandomPointDistributionOp.h rename to cortex-9.0.0-a10/include/IECore/MappedRandomPointDistributionOp.h diff --git a/cortex-9.0.0-a6/include/IECore/Marschner.h b/cortex-9.0.0-a10/include/IECore/Marschner.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Marschner.h rename to cortex-9.0.0-a10/include/IECore/Marschner.h diff --git a/cortex-9.0.0-a6/include/IECore/Marschner.inl b/cortex-9.0.0-a10/include/IECore/Marschner.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Marschner.inl rename to cortex-9.0.0-a10/include/IECore/Marschner.inl diff --git a/cortex-9.0.0-a6/include/IECore/MarschnerLookupTableOp.h b/cortex-9.0.0-a10/include/IECore/MarschnerLookupTableOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MarschnerLookupTableOp.h rename to cortex-9.0.0-a10/include/IECore/MarschnerLookupTableOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MarschnerParameter.h b/cortex-9.0.0-a10/include/IECore/MarschnerParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MarschnerParameter.h rename to cortex-9.0.0-a10/include/IECore/MarschnerParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/Math.h b/cortex-9.0.0-a10/include/IECore/Math.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Math.h rename to cortex-9.0.0-a10/include/IECore/Math.h diff --git a/cortex-9.0.0-a6/include/IECore/Math.inl b/cortex-9.0.0-a10/include/IECore/Math.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Math.inl rename to cortex-9.0.0-a10/include/IECore/Math.inl diff --git a/cortex-9.0.0-a6/include/IECore/MatrixAlgo.h b/cortex-9.0.0-a10/include/IECore/MatrixAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixAlgo.h rename to cortex-9.0.0-a10/include/IECore/MatrixAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/MatrixAlgo.inl b/cortex-9.0.0-a10/include/IECore/MatrixAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixAlgo.inl rename to cortex-9.0.0-a10/include/IECore/MatrixAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/MatrixInterpolator.inl b/cortex-9.0.0-a10/include/IECore/MatrixInterpolator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixInterpolator.inl rename to cortex-9.0.0-a10/include/IECore/MatrixInterpolator.inl diff --git a/cortex-9.0.0-a6/include/IECore/MatrixMotionTransform.h b/cortex-9.0.0-a10/include/IECore/MatrixMotionTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixMotionTransform.h rename to cortex-9.0.0-a10/include/IECore/MatrixMotionTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/MatrixMultiplyOp.h b/cortex-9.0.0-a10/include/IECore/MatrixMultiplyOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixMultiplyOp.h rename to cortex-9.0.0-a10/include/IECore/MatrixMultiplyOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MatrixOps.h b/cortex-9.0.0-a10/include/IECore/MatrixOps.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixOps.h rename to cortex-9.0.0-a10/include/IECore/MatrixOps.h diff --git a/cortex-9.0.0-a6/include/IECore/MatrixOps.inl b/cortex-9.0.0-a10/include/IECore/MatrixOps.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixOps.inl rename to cortex-9.0.0-a10/include/IECore/MatrixOps.inl diff --git a/cortex-9.0.0-a6/include/IECore/MatrixTraits.h b/cortex-9.0.0-a10/include/IECore/MatrixTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixTraits.h rename to cortex-9.0.0-a10/include/IECore/MatrixTraits.h diff --git a/cortex-9.0.0-a6/include/IECore/MatrixTransform.h b/cortex-9.0.0-a10/include/IECore/MatrixTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MatrixTransform.h rename to cortex-9.0.0-a10/include/IECore/MatrixTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/MeanSquaredError.h b/cortex-9.0.0-a10/include/IECore/MeanSquaredError.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeanSquaredError.h rename to cortex-9.0.0-a10/include/IECore/MeanSquaredError.h diff --git a/cortex-9.0.0-a6/include/IECore/MeanSquaredError.inl b/cortex-9.0.0-a10/include/IECore/MeanSquaredError.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeanSquaredError.inl rename to cortex-9.0.0-a10/include/IECore/MeanSquaredError.inl diff --git a/cortex-9.0.0-a6/include/IECore/MedianCutSampler.h b/cortex-9.0.0-a10/include/IECore/MedianCutSampler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MedianCutSampler.h rename to cortex-9.0.0-a10/include/IECore/MedianCutSampler.h diff --git a/cortex-9.0.0-a6/include/IECore/MemoryIndexedIO.h b/cortex-9.0.0-a10/include/IECore/MemoryIndexedIO.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MemoryIndexedIO.h rename to cortex-9.0.0-a10/include/IECore/MemoryIndexedIO.h diff --git a/cortex-9.0.0-a6/include/IECore/MemoryStream.h b/cortex-9.0.0-a10/include/IECore/MemoryStream.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MemoryStream.h rename to cortex-9.0.0-a10/include/IECore/MemoryStream.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshDistortionsOp.h b/cortex-9.0.0-a10/include/IECore/MeshDistortionsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshDistortionsOp.h rename to cortex-9.0.0-a10/include/IECore/MeshDistortionsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshFaceFilterOp.h b/cortex-9.0.0-a10/include/IECore/MeshFaceFilterOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshFaceFilterOp.h rename to cortex-9.0.0-a10/include/IECore/MeshFaceFilterOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshMergeOp.h b/cortex-9.0.0-a10/include/IECore/MeshMergeOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshMergeOp.h rename to cortex-9.0.0-a10/include/IECore/MeshMergeOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshNormalsOp.h b/cortex-9.0.0-a10/include/IECore/MeshNormalsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshNormalsOp.h rename to cortex-9.0.0-a10/include/IECore/MeshNormalsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshPrimitive.h b/cortex-9.0.0-a10/include/IECore/MeshPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshPrimitive.h rename to cortex-9.0.0-a10/include/IECore/MeshPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshPrimitiveBuilder.h b/cortex-9.0.0-a10/include/IECore/MeshPrimitiveBuilder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshPrimitiveBuilder.h rename to cortex-9.0.0-a10/include/IECore/MeshPrimitiveBuilder.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshPrimitiveEvaluator.h b/cortex-9.0.0-a10/include/IECore/MeshPrimitiveEvaluator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshPrimitiveEvaluator.h rename to cortex-9.0.0-a10/include/IECore/MeshPrimitiveEvaluator.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshPrimitiveShrinkWrapOp.h b/cortex-9.0.0-a10/include/IECore/MeshPrimitiveShrinkWrapOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshPrimitiveShrinkWrapOp.h rename to cortex-9.0.0-a10/include/IECore/MeshPrimitiveShrinkWrapOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshTangentsOp.h b/cortex-9.0.0-a10/include/IECore/MeshTangentsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshTangentsOp.h rename to cortex-9.0.0-a10/include/IECore/MeshTangentsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MeshVertexReorderOp.h b/cortex-9.0.0-a10/include/IECore/MeshVertexReorderOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MeshVertexReorderOp.h rename to cortex-9.0.0-a10/include/IECore/MeshVertexReorderOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MessageHandler.h b/cortex-9.0.0-a10/include/IECore/MessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MessageHandler.h rename to cortex-9.0.0-a10/include/IECore/MessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECore/MixSmoothSkinningWeightsOp.h b/cortex-9.0.0-a10/include/IECore/MixSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MixSmoothSkinningWeightsOp.h rename to cortex-9.0.0-a10/include/IECore/MixSmoothSkinningWeightsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/ModifyOp.h b/cortex-9.0.0-a10/include/IECore/ModifyOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ModifyOp.h rename to cortex-9.0.0-a10/include/IECore/ModifyOp.h diff --git a/cortex-9.0.0-a6/include/IECore/MotionBlock.h b/cortex-9.0.0-a10/include/IECore/MotionBlock.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MotionBlock.h rename to cortex-9.0.0-a10/include/IECore/MotionBlock.h diff --git a/cortex-9.0.0-a6/include/IECore/MotionPrimitive.h b/cortex-9.0.0-a10/include/IECore/MotionPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MotionPrimitive.h rename to cortex-9.0.0-a10/include/IECore/MotionPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/MurmurHash.h b/cortex-9.0.0-a10/include/IECore/MurmurHash.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MurmurHash.h rename to cortex-9.0.0-a10/include/IECore/MurmurHash.h diff --git a/cortex-9.0.0-a6/include/IECore/MurmurHash.inl b/cortex-9.0.0-a10/include/IECore/MurmurHash.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/MurmurHash.inl rename to cortex-9.0.0-a10/include/IECore/MurmurHash.inl diff --git a/cortex-9.0.0-a6/include/IECore/NParticleReader.h b/cortex-9.0.0-a10/include/IECore/NParticleReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NParticleReader.h rename to cortex-9.0.0-a10/include/IECore/NParticleReader.h diff --git a/cortex-9.0.0-a6/include/IECore/NURBSPrimitive.h b/cortex-9.0.0-a10/include/IECore/NURBSPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NURBSPrimitive.h rename to cortex-9.0.0-a10/include/IECore/NURBSPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/NormalizeSmoothSkinningWeightsOp.h b/cortex-9.0.0-a10/include/IECore/NormalizeSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NormalizeSmoothSkinningWeightsOp.h rename to cortex-9.0.0-a10/include/IECore/NormalizeSmoothSkinningWeightsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/NullMessageHandler.h b/cortex-9.0.0-a10/include/IECore/NullMessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NullMessageHandler.h rename to cortex-9.0.0-a10/include/IECore/NullMessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECore/NullObject.h b/cortex-9.0.0-a10/include/IECore/NullObject.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NullObject.h rename to cortex-9.0.0-a10/include/IECore/NullObject.h diff --git a/cortex-9.0.0-a6/include/IECore/NumericParameter.h b/cortex-9.0.0-a10/include/IECore/NumericParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/NumericParameter.h rename to cortex-9.0.0-a10/include/IECore/NumericParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/OBJReader.h b/cortex-9.0.0-a10/include/IECore/OBJReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/OBJReader.h rename to cortex-9.0.0-a10/include/IECore/OBJReader.h diff --git a/cortex-9.0.0-a6/include/IECore/OStreamMessageHandler.h b/cortex-9.0.0-a10/include/IECore/OStreamMessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/OStreamMessageHandler.h rename to cortex-9.0.0-a10/include/IECore/OStreamMessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECore/Object.h b/cortex-9.0.0-a10/include/IECore/Object.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Object.h rename to cortex-9.0.0-a10/include/IECore/Object.h diff --git a/cortex-9.0.0-a6/include/IECore/Object.inl b/cortex-9.0.0-a10/include/IECore/Object.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Object.inl rename to cortex-9.0.0-a10/include/IECore/Object.inl diff --git a/cortex-9.0.0-a6/include/IECore/ObjectInterpolator.h b/cortex-9.0.0-a10/include/IECore/ObjectInterpolator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectInterpolator.h rename to cortex-9.0.0-a10/include/IECore/ObjectInterpolator.h diff --git a/cortex-9.0.0-a6/include/IECore/ObjectParameter.h b/cortex-9.0.0-a10/include/IECore/ObjectParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectParameter.h rename to cortex-9.0.0-a10/include/IECore/ObjectParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/ObjectPool.h b/cortex-9.0.0-a10/include/IECore/ObjectPool.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectPool.h rename to cortex-9.0.0-a10/include/IECore/ObjectPool.h diff --git a/cortex-9.0.0-a6/include/IECore/ObjectReader.h b/cortex-9.0.0-a10/include/IECore/ObjectReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectReader.h rename to cortex-9.0.0-a10/include/IECore/ObjectReader.h diff --git a/cortex-9.0.0-a6/include/IECore/ObjectVector.h b/cortex-9.0.0-a10/include/IECore/ObjectVector.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectVector.h rename to cortex-9.0.0-a10/include/IECore/ObjectVector.h diff --git a/cortex-9.0.0-a6/include/IECore/ObjectWriter.h b/cortex-9.0.0-a10/include/IECore/ObjectWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ObjectWriter.h rename to cortex-9.0.0-a10/include/IECore/ObjectWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/Op.h b/cortex-9.0.0-a10/include/IECore/Op.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Op.h rename to cortex-9.0.0-a10/include/IECore/Op.h diff --git a/cortex-9.0.0-a6/include/IECore/Options.h b/cortex-9.0.0-a10/include/IECore/Options.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Options.h rename to cortex-9.0.0-a10/include/IECore/Options.h diff --git a/cortex-9.0.0-a6/include/IECore/OversamplesCalculator.h b/cortex-9.0.0-a10/include/IECore/OversamplesCalculator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/OversamplesCalculator.h rename to cortex-9.0.0-a10/include/IECore/OversamplesCalculator.h diff --git a/cortex-9.0.0-a6/include/IECore/OversamplesCalculator.inl b/cortex-9.0.0-a10/include/IECore/OversamplesCalculator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/OversamplesCalculator.inl rename to cortex-9.0.0-a10/include/IECore/OversamplesCalculator.inl diff --git a/cortex-9.0.0-a6/include/IECore/PDCParticleReader.h b/cortex-9.0.0-a10/include/IECore/PDCParticleReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PDCParticleReader.h rename to cortex-9.0.0-a10/include/IECore/PDCParticleReader.h diff --git a/cortex-9.0.0-a6/include/IECore/PDCParticleWriter.h b/cortex-9.0.0-a10/include/IECore/PDCParticleWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PDCParticleWriter.h rename to cortex-9.0.0-a10/include/IECore/PDCParticleWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/PNGImageReader.h b/cortex-9.0.0-a10/include/IECore/PNGImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PNGImageReader.h rename to cortex-9.0.0-a10/include/IECore/PNGImageReader.h diff --git a/cortex-9.0.0-a6/include/IECore/PanalogToLinearDataConversion.h b/cortex-9.0.0-a10/include/IECore/PanalogToLinearDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PanalogToLinearDataConversion.h rename to cortex-9.0.0-a10/include/IECore/PanalogToLinearDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/PanalogToLinearDataConversion.inl b/cortex-9.0.0-a10/include/IECore/PanalogToLinearDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PanalogToLinearDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/PanalogToLinearDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/PanalogToLinearOp.h b/cortex-9.0.0-a10/include/IECore/PanalogToLinearOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PanalogToLinearOp.h rename to cortex-9.0.0-a10/include/IECore/PanalogToLinearOp.h diff --git a/cortex-9.0.0-a6/include/IECore/Parameter.h b/cortex-9.0.0-a10/include/IECore/Parameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Parameter.h rename to cortex-9.0.0-a10/include/IECore/Parameter.h diff --git a/cortex-9.0.0-a6/include/IECore/Parameter.inl b/cortex-9.0.0-a10/include/IECore/Parameter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Parameter.inl rename to cortex-9.0.0-a10/include/IECore/Parameter.inl diff --git a/cortex-9.0.0-a6/include/IECore/Parameterised.h b/cortex-9.0.0-a10/include/IECore/Parameterised.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Parameterised.h rename to cortex-9.0.0-a10/include/IECore/Parameterised.h diff --git a/cortex-9.0.0-a6/include/IECore/ParameterisedInterface.h b/cortex-9.0.0-a10/include/IECore/ParameterisedInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ParameterisedInterface.h rename to cortex-9.0.0-a10/include/IECore/ParameterisedInterface.h diff --git a/cortex-9.0.0-a6/include/IECore/ParameterisedProcedural.h b/cortex-9.0.0-a10/include/IECore/ParameterisedProcedural.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ParameterisedProcedural.h rename to cortex-9.0.0-a10/include/IECore/ParameterisedProcedural.h diff --git a/cortex-9.0.0-a6/include/IECore/ParticleReader.h b/cortex-9.0.0-a10/include/IECore/ParticleReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ParticleReader.h rename to cortex-9.0.0-a10/include/IECore/ParticleReader.h diff --git a/cortex-9.0.0-a6/include/IECore/ParticleReader.inl b/cortex-9.0.0-a10/include/IECore/ParticleReader.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ParticleReader.inl rename to cortex-9.0.0-a10/include/IECore/ParticleReader.inl diff --git a/cortex-9.0.0-a6/include/IECore/ParticleWriter.h b/cortex-9.0.0-a10/include/IECore/ParticleWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ParticleWriter.h rename to cortex-9.0.0-a10/include/IECore/ParticleWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/PatchMeshPrimitive.h b/cortex-9.0.0-a10/include/IECore/PatchMeshPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PatchMeshPrimitive.h rename to cortex-9.0.0-a10/include/IECore/PatchMeshPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/PathParameter.h b/cortex-9.0.0-a10/include/IECore/PathParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PathParameter.h rename to cortex-9.0.0-a10/include/IECore/PathParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/PathVectorParameter.h b/cortex-9.0.0-a10/include/IECore/PathVectorParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PathVectorParameter.h rename to cortex-9.0.0-a10/include/IECore/PathVectorParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/PerlinNoise.h b/cortex-9.0.0-a10/include/IECore/PerlinNoise.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PerlinNoise.h rename to cortex-9.0.0-a10/include/IECore/PerlinNoise.h diff --git a/cortex-9.0.0-a6/include/IECore/PerlinNoise.inl b/cortex-9.0.0-a10/include/IECore/PerlinNoise.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PerlinNoise.inl rename to cortex-9.0.0-a10/include/IECore/PerlinNoise.inl diff --git a/cortex-9.0.0-a6/include/IECore/PointBoundsOp.h b/cortex-9.0.0-a10/include/IECore/PointBoundsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointBoundsOp.h rename to cortex-9.0.0-a10/include/IECore/PointBoundsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointDensitiesOp.h b/cortex-9.0.0-a10/include/IECore/PointDensitiesOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointDensitiesOp.h rename to cortex-9.0.0-a10/include/IECore/PointDensitiesOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointDistribution.h b/cortex-9.0.0-a10/include/IECore/PointDistribution.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointDistribution.h rename to cortex-9.0.0-a10/include/IECore/PointDistribution.h diff --git a/cortex-9.0.0-a6/include/IECore/PointDistribution.inl b/cortex-9.0.0-a10/include/IECore/PointDistribution.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointDistribution.inl rename to cortex-9.0.0-a10/include/IECore/PointDistribution.inl diff --git a/cortex-9.0.0-a6/include/IECore/PointDistributionOp.h b/cortex-9.0.0-a10/include/IECore/PointDistributionOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointDistributionOp.h rename to cortex-9.0.0-a10/include/IECore/PointDistributionOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointNormalsOp.h b/cortex-9.0.0-a10/include/IECore/PointNormalsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointNormalsOp.h rename to cortex-9.0.0-a10/include/IECore/PointNormalsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointRepulsionOp.h b/cortex-9.0.0-a10/include/IECore/PointRepulsionOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointRepulsionOp.h rename to cortex-9.0.0-a10/include/IECore/PointRepulsionOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointSmoothSkinningOp.h b/cortex-9.0.0-a10/include/IECore/PointSmoothSkinningOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointSmoothSkinningOp.h rename to cortex-9.0.0-a10/include/IECore/PointSmoothSkinningOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointVelocityDisplaceOp.h b/cortex-9.0.0-a10/include/IECore/PointVelocityDisplaceOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointVelocityDisplaceOp.h rename to cortex-9.0.0-a10/include/IECore/PointVelocityDisplaceOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointsMotionOp.h b/cortex-9.0.0-a10/include/IECore/PointsMotionOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointsMotionOp.h rename to cortex-9.0.0-a10/include/IECore/PointsMotionOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PointsPrimitive.h b/cortex-9.0.0-a10/include/IECore/PointsPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointsPrimitive.h rename to cortex-9.0.0-a10/include/IECore/PointsPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/PointsPrimitiveEvaluator.h b/cortex-9.0.0-a10/include/IECore/PointsPrimitiveEvaluator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PointsPrimitiveEvaluator.h rename to cortex-9.0.0-a10/include/IECore/PointsPrimitiveEvaluator.h diff --git a/cortex-9.0.0-a6/include/IECore/PolygonAlgo.h b/cortex-9.0.0-a10/include/IECore/PolygonAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonAlgo.h rename to cortex-9.0.0-a10/include/IECore/PolygonAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/PolygonAlgo.inl b/cortex-9.0.0-a10/include/IECore/PolygonAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonAlgo.inl rename to cortex-9.0.0-a10/include/IECore/PolygonAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/PolygonIterator.h b/cortex-9.0.0-a10/include/IECore/PolygonIterator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonIterator.h rename to cortex-9.0.0-a10/include/IECore/PolygonIterator.h diff --git a/cortex-9.0.0-a6/include/IECore/PolygonIterator.inl b/cortex-9.0.0-a10/include/IECore/PolygonIterator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonIterator.inl rename to cortex-9.0.0-a10/include/IECore/PolygonIterator.inl diff --git a/cortex-9.0.0-a6/include/IECore/PolygonVertexIterator.h b/cortex-9.0.0-a10/include/IECore/PolygonVertexIterator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonVertexIterator.h rename to cortex-9.0.0-a10/include/IECore/PolygonVertexIterator.h diff --git a/cortex-9.0.0-a6/include/IECore/PolygonVertexIterator.inl b/cortex-9.0.0-a10/include/IECore/PolygonVertexIterator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PolygonVertexIterator.inl rename to cortex-9.0.0-a10/include/IECore/PolygonVertexIterator.inl diff --git a/cortex-9.0.0-a6/include/IECore/PreWorldRenderable.h b/cortex-9.0.0-a10/include/IECore/PreWorldRenderable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PreWorldRenderable.h rename to cortex-9.0.0-a10/include/IECore/PreWorldRenderable.h diff --git a/cortex-9.0.0-a6/include/IECore/Primitive.h b/cortex-9.0.0-a10/include/IECore/Primitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Primitive.h rename to cortex-9.0.0-a10/include/IECore/Primitive.h diff --git a/cortex-9.0.0-a6/include/IECore/Primitive.inl b/cortex-9.0.0-a10/include/IECore/Primitive.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Primitive.inl rename to cortex-9.0.0-a10/include/IECore/Primitive.inl diff --git a/cortex-9.0.0-a6/include/IECore/PrimitiveEvaluator.h b/cortex-9.0.0-a10/include/IECore/PrimitiveEvaluator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PrimitiveEvaluator.h rename to cortex-9.0.0-a10/include/IECore/PrimitiveEvaluator.h diff --git a/cortex-9.0.0-a6/include/IECore/PrimitiveOp.h b/cortex-9.0.0-a10/include/IECore/PrimitiveOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PrimitiveOp.h rename to cortex-9.0.0-a10/include/IECore/PrimitiveOp.h diff --git a/cortex-9.0.0-a6/include/IECore/PrimitiveVariable.h b/cortex-9.0.0-a10/include/IECore/PrimitiveVariable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/PrimitiveVariable.h rename to cortex-9.0.0-a10/include/IECore/PrimitiveVariable.h diff --git a/cortex-9.0.0-a6/include/IECore/QuatAlgo.h b/cortex-9.0.0-a10/include/IECore/QuatAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/QuatAlgo.h rename to cortex-9.0.0-a10/include/IECore/QuatAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/QuatInterpolator.inl b/cortex-9.0.0-a10/include/IECore/QuatInterpolator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/QuatInterpolator.inl rename to cortex-9.0.0-a10/include/IECore/QuatInterpolator.inl diff --git a/cortex-9.0.0-a6/include/IECore/RGBToXYZColorTransform.h b/cortex-9.0.0-a10/include/IECore/RGBToXYZColorTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RGBToXYZColorTransform.h rename to cortex-9.0.0-a10/include/IECore/RGBToXYZColorTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/RGBToXYZColorTransform.inl b/cortex-9.0.0-a10/include/IECore/RGBToXYZColorTransform.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RGBToXYZColorTransform.inl rename to cortex-9.0.0-a10/include/IECore/RGBToXYZColorTransform.inl diff --git a/cortex-9.0.0-a6/include/IECore/RadixSort.h b/cortex-9.0.0-a10/include/IECore/RadixSort.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RadixSort.h rename to cortex-9.0.0-a10/include/IECore/RadixSort.h diff --git a/cortex-9.0.0-a6/include/IECore/Random.h b/cortex-9.0.0-a10/include/IECore/Random.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Random.h rename to cortex-9.0.0-a10/include/IECore/Random.h diff --git a/cortex-9.0.0-a6/include/IECore/Random.inl b/cortex-9.0.0-a10/include/IECore/Random.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Random.inl rename to cortex-9.0.0-a10/include/IECore/Random.inl diff --git a/cortex-9.0.0-a6/include/IECore/RandomRotationOp.h b/cortex-9.0.0-a10/include/IECore/RandomRotationOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RandomRotationOp.h rename to cortex-9.0.0-a10/include/IECore/RandomRotationOp.h diff --git a/cortex-9.0.0-a6/include/IECore/RandomRotationOp.inl b/cortex-9.0.0-a10/include/IECore/RandomRotationOp.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RandomRotationOp.inl rename to cortex-9.0.0-a10/include/IECore/RandomRotationOp.inl diff --git a/cortex-9.0.0-a6/include/IECore/Reader.h b/cortex-9.0.0-a10/include/IECore/Reader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Reader.h rename to cortex-9.0.0-a10/include/IECore/Reader.h diff --git a/cortex-9.0.0-a6/include/IECore/Reader.inl b/cortex-9.0.0-a10/include/IECore/Reader.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Reader.inl rename to cortex-9.0.0-a10/include/IECore/Reader.inl diff --git a/cortex-9.0.0-a6/include/IECore/RealSphericalHarmonicFunction.h b/cortex-9.0.0-a10/include/IECore/RealSphericalHarmonicFunction.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RealSphericalHarmonicFunction.h rename to cortex-9.0.0-a10/include/IECore/RealSphericalHarmonicFunction.h diff --git a/cortex-9.0.0-a6/include/IECore/RealSphericalHarmonicFunction.inl b/cortex-9.0.0-a10/include/IECore/RealSphericalHarmonicFunction.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RealSphericalHarmonicFunction.inl rename to cortex-9.0.0-a10/include/IECore/RealSphericalHarmonicFunction.inl diff --git a/cortex-9.0.0-a6/include/IECore/Rec709ToLinearDataConversion.h b/cortex-9.0.0-a10/include/IECore/Rec709ToLinearDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Rec709ToLinearDataConversion.h rename to cortex-9.0.0-a10/include/IECore/Rec709ToLinearDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/Rec709ToLinearDataConversion.inl b/cortex-9.0.0-a10/include/IECore/Rec709ToLinearDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Rec709ToLinearDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/Rec709ToLinearDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/Rec709ToLinearOp.h b/cortex-9.0.0-a10/include/IECore/Rec709ToLinearOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Rec709ToLinearOp.h rename to cortex-9.0.0-a10/include/IECore/Rec709ToLinearOp.h diff --git a/cortex-9.0.0-a6/include/IECore/RefCounted.h b/cortex-9.0.0-a10/include/IECore/RefCounted.h similarity index 95% rename from cortex-9.0.0-a6/include/IECore/RefCounted.h rename to cortex-9.0.0-a10/include/IECore/RefCounted.h index 051d9f2257..ef943eb058 100644 --- a/cortex-9.0.0-a6/include/IECore/RefCounted.h +++ b/cortex-9.0.0-a10/include/IECore/RefCounted.h @@ -169,6 +169,16 @@ inline void intrusive_ptr_release( const IECore::RefCounted *r ) r->removeRef(); } +/// Implementation of tbb_hasher to allow intrusive_ptrs to be used +/// with tbb_concurrent_* containers. +template +inline size_t tbb_hasher( const boost::intrusive_ptr &ptr ) +{ + // This is the same as what tbb uses for raw pointers + const size_t h = reinterpret_cast( ptr.get() ); + return (h >> 3) ^ h; +} + } // namespace IECore diff --git a/cortex-9.0.0-a6/include/IECore/RemoveSmoothSkinningInfluencesOp.h b/cortex-9.0.0-a10/include/IECore/RemoveSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RemoveSmoothSkinningInfluencesOp.h rename to cortex-9.0.0-a10/include/IECore/RemoveSmoothSkinningInfluencesOp.h diff --git a/cortex-9.0.0-a6/include/IECore/Renderable.h b/cortex-9.0.0-a10/include/IECore/Renderable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Renderable.h rename to cortex-9.0.0-a10/include/IECore/Renderable.h diff --git a/cortex-9.0.0-a6/include/IECore/Renderer.h b/cortex-9.0.0-a10/include/IECore/Renderer.h similarity index 99% rename from cortex-9.0.0-a6/include/IECore/Renderer.h rename to cortex-9.0.0-a10/include/IECore/Renderer.h index 3937153b40..4de7cc4e0d 100644 --- a/cortex-9.0.0-a6/include/IECore/Renderer.h +++ b/cortex-9.0.0-a10/include/IECore/Renderer.h @@ -139,6 +139,9 @@ class Renderer : public RunTimeTyped /// \li "resolution" V2iData
/// The resolution of any output images. Should default to 640x480 if not specified. /// + /// \li "pixelAspectRatio" FloatData
+ /// The xSize/ySize aspect ratio for a pixel. + /// /// \li "screenWindow" Box2fData
/// The region in screen space which is mapped to the output resolution. If unspecified /// then this should default to -1,1 in the smallest image dimension and the other diff --git a/cortex-9.0.0-a6/include/IECore/ReorderSmoothSkinningInfluencesOp.h b/cortex-9.0.0-a10/include/IECore/ReorderSmoothSkinningInfluencesOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ReorderSmoothSkinningInfluencesOp.h rename to cortex-9.0.0-a10/include/IECore/ReorderSmoothSkinningInfluencesOp.h diff --git a/cortex-9.0.0-a6/include/IECore/ReorderedFrameList.h b/cortex-9.0.0-a10/include/IECore/ReorderedFrameList.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ReorderedFrameList.h rename to cortex-9.0.0-a10/include/IECore/ReorderedFrameList.h diff --git a/cortex-9.0.0-a6/include/IECore/ReorderedFrameList.inl b/cortex-9.0.0-a10/include/IECore/ReorderedFrameList.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ReorderedFrameList.inl rename to cortex-9.0.0-a10/include/IECore/ReorderedFrameList.inl diff --git a/cortex-9.0.0-a6/include/IECore/ReversedFrameList.h b/cortex-9.0.0-a10/include/IECore/ReversedFrameList.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ReversedFrameList.h rename to cortex-9.0.0-a10/include/IECore/ReversedFrameList.h diff --git a/cortex-9.0.0-a6/include/IECore/RunTimeTyped.h b/cortex-9.0.0-a10/include/IECore/RunTimeTyped.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RunTimeTyped.h rename to cortex-9.0.0-a10/include/IECore/RunTimeTyped.h diff --git a/cortex-9.0.0-a6/include/IECore/RunTimeTyped.inl b/cortex-9.0.0-a10/include/IECore/RunTimeTyped.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/RunTimeTyped.inl rename to cortex-9.0.0-a10/include/IECore/RunTimeTyped.inl diff --git a/cortex-9.0.0-a6/include/IECore/SGIImageReader.h b/cortex-9.0.0-a10/include/IECore/SGIImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SGIImageReader.h rename to cortex-9.0.0-a10/include/IECore/SGIImageReader.h diff --git a/cortex-9.0.0-a6/include/IECore/SRGBToLinearDataConversion.h b/cortex-9.0.0-a10/include/IECore/SRGBToLinearDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SRGBToLinearDataConversion.h rename to cortex-9.0.0-a10/include/IECore/SRGBToLinearDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/SRGBToLinearDataConversion.inl b/cortex-9.0.0-a10/include/IECore/SRGBToLinearDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SRGBToLinearDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/SRGBToLinearDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/SRGBToLinearOp.h b/cortex-9.0.0-a10/include/IECore/SRGBToLinearOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SRGBToLinearOp.h rename to cortex-9.0.0-a10/include/IECore/SRGBToLinearOp.h diff --git a/cortex-9.0.0-a6/include/IECore/SampledSceneInterface.h b/cortex-9.0.0-a10/include/IECore/SampledSceneInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SampledSceneInterface.h rename to cortex-9.0.0-a10/include/IECore/SampledSceneInterface.h diff --git a/cortex-9.0.0-a6/include/IECore/ScaledDataConversion.h b/cortex-9.0.0-a10/include/IECore/ScaledDataConversion.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ScaledDataConversion.h rename to cortex-9.0.0-a10/include/IECore/ScaledDataConversion.h diff --git a/cortex-9.0.0-a6/include/IECore/ScaledDataConversion.inl b/cortex-9.0.0-a10/include/IECore/ScaledDataConversion.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ScaledDataConversion.inl rename to cortex-9.0.0-a10/include/IECore/ScaledDataConversion.inl diff --git a/cortex-9.0.0-a6/include/IECore/SceneCache.h b/cortex-9.0.0-a10/include/IECore/SceneCache.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SceneCache.h rename to cortex-9.0.0-a10/include/IECore/SceneCache.h diff --git a/cortex-9.0.0-a6/include/IECore/SceneInterface.h b/cortex-9.0.0-a10/include/IECore/SceneInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SceneInterface.h rename to cortex-9.0.0-a10/include/IECore/SceneInterface.h diff --git a/cortex-9.0.0-a6/include/IECore/SceneInterface.inl b/cortex-9.0.0-a10/include/IECore/SceneInterface.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SceneInterface.inl rename to cortex-9.0.0-a10/include/IECore/SceneInterface.inl diff --git a/cortex-9.0.0-a6/include/IECore/SearchPath.h b/cortex-9.0.0-a10/include/IECore/SearchPath.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SearchPath.h rename to cortex-9.0.0-a10/include/IECore/SearchPath.h diff --git a/cortex-9.0.0-a6/include/IECore/Shader.h b/cortex-9.0.0-a10/include/IECore/Shader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Shader.h rename to cortex-9.0.0-a10/include/IECore/Shader.h diff --git a/cortex-9.0.0-a6/include/IECore/SharedSceneInterfaces.h b/cortex-9.0.0-a10/include/IECore/SharedSceneInterfaces.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SharedSceneInterfaces.h rename to cortex-9.0.0-a10/include/IECore/SharedSceneInterfaces.h diff --git a/cortex-9.0.0-a6/include/IECore/SimpleSubsurface.h b/cortex-9.0.0-a10/include/IECore/SimpleSubsurface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SimpleSubsurface.h rename to cortex-9.0.0-a10/include/IECore/SimpleSubsurface.h diff --git a/cortex-9.0.0-a6/include/IECore/SimpleTypedData.h b/cortex-9.0.0-a10/include/IECore/SimpleTypedData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SimpleTypedData.h rename to cortex-9.0.0-a10/include/IECore/SimpleTypedData.h diff --git a/cortex-9.0.0-a6/include/IECore/SimpleTypedParameter.h b/cortex-9.0.0-a10/include/IECore/SimpleTypedParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SimpleTypedParameter.h rename to cortex-9.0.0-a10/include/IECore/SimpleTypedParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/SmoothSkinningData.h b/cortex-9.0.0-a10/include/IECore/SmoothSkinningData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SmoothSkinningData.h rename to cortex-9.0.0-a10/include/IECore/SmoothSkinningData.h diff --git a/cortex-9.0.0-a6/include/IECore/SmoothSmoothSkinningWeightsOp.h b/cortex-9.0.0-a10/include/IECore/SmoothSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SmoothSmoothSkinningWeightsOp.h rename to cortex-9.0.0-a10/include/IECore/SmoothSmoothSkinningWeightsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/SpaceTransform.h b/cortex-9.0.0-a10/include/IECore/SpaceTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SpaceTransform.h rename to cortex-9.0.0-a10/include/IECore/SpaceTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/SpherePrimitive.h b/cortex-9.0.0-a10/include/IECore/SpherePrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SpherePrimitive.h rename to cortex-9.0.0-a10/include/IECore/SpherePrimitive.h diff --git a/cortex-9.0.0-a6/include/IECore/SpherePrimitiveEvaluator.h b/cortex-9.0.0-a10/include/IECore/SpherePrimitiveEvaluator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SpherePrimitiveEvaluator.h rename to cortex-9.0.0-a10/include/IECore/SpherePrimitiveEvaluator.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonics.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonics.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonics.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonics.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonics.inl b/cortex-9.0.0-a10/include/IECore/SphericalHarmonics.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonics.inl rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonics.inl diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsAlgo.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsAlgo.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsAlgo.inl b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsAlgo.inl rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsProjector.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsProjector.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsProjector.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsProjector.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsProjector.inl b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsProjector.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsProjector.inl rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsProjector.inl diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsRotationMatrix.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsRotationMatrix.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsRotationMatrix.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsRotationMatrix.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsRotationMatrix.inl b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsRotationMatrix.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsRotationMatrix.inl rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsRotationMatrix.inl diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTensor.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTensor.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTensor.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTensor.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTransferMatrix.h b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTransferMatrix.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTransferMatrix.h rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTransferMatrix.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTransferMatrix.inl b/cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTransferMatrix.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalHarmonicsTransferMatrix.inl rename to cortex-9.0.0-a10/include/IECore/SphericalHarmonicsTransferMatrix.inl diff --git a/cortex-9.0.0-a6/include/IECore/SphericalToEuclideanTransform.h b/cortex-9.0.0-a10/include/IECore/SphericalToEuclideanTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalToEuclideanTransform.h rename to cortex-9.0.0-a10/include/IECore/SphericalToEuclideanTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/SphericalToEuclideanTransform.inl b/cortex-9.0.0-a10/include/IECore/SphericalToEuclideanTransform.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SphericalToEuclideanTransform.inl rename to cortex-9.0.0-a10/include/IECore/SphericalToEuclideanTransform.inl diff --git a/cortex-9.0.0-a6/include/IECore/Spline.h b/cortex-9.0.0-a10/include/IECore/Spline.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Spline.h rename to cortex-9.0.0-a10/include/IECore/Spline.h diff --git a/cortex-9.0.0-a6/include/IECore/Spline.inl b/cortex-9.0.0-a10/include/IECore/Spline.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Spline.inl rename to cortex-9.0.0-a10/include/IECore/Spline.inl diff --git a/cortex-9.0.0-a6/include/IECore/SplineData.h b/cortex-9.0.0-a10/include/IECore/SplineData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SplineData.h rename to cortex-9.0.0-a10/include/IECore/SplineData.h diff --git a/cortex-9.0.0-a6/include/IECore/SplineParameter.h b/cortex-9.0.0-a10/include/IECore/SplineParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SplineParameter.h rename to cortex-9.0.0-a10/include/IECore/SplineParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/SplineToImage.h b/cortex-9.0.0-a10/include/IECore/SplineToImage.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SplineToImage.h rename to cortex-9.0.0-a10/include/IECore/SplineToImage.h diff --git a/cortex-9.0.0-a6/include/IECore/StandardRadialLensModel.h b/cortex-9.0.0-a10/include/IECore/StandardRadialLensModel.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/StandardRadialLensModel.h rename to cortex-9.0.0-a10/include/IECore/StandardRadialLensModel.h diff --git a/cortex-9.0.0-a6/include/IECore/StateRenderable.h b/cortex-9.0.0-a10/include/IECore/StateRenderable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/StateRenderable.h rename to cortex-9.0.0-a10/include/IECore/StateRenderable.h diff --git a/cortex-9.0.0-a6/include/IECore/StreamIndexedIO.h b/cortex-9.0.0-a10/include/IECore/StreamIndexedIO.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/StreamIndexedIO.h rename to cortex-9.0.0-a10/include/IECore/StreamIndexedIO.h diff --git a/cortex-9.0.0-a6/include/IECore/StringAlgo.h b/cortex-9.0.0-a10/include/IECore/StringAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/StringAlgo.h rename to cortex-9.0.0-a10/include/IECore/StringAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/StringAlgo.inl b/cortex-9.0.0-a10/include/IECore/StringAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/StringAlgo.inl rename to cortex-9.0.0-a10/include/IECore/StringAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/SummedAreaOp.h b/cortex-9.0.0-a10/include/IECore/SummedAreaOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SummedAreaOp.h rename to cortex-9.0.0-a10/include/IECore/SummedAreaOp.h diff --git a/cortex-9.0.0-a6/include/IECore/SweepAndPrune.h b/cortex-9.0.0-a10/include/IECore/SweepAndPrune.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SweepAndPrune.h rename to cortex-9.0.0-a10/include/IECore/SweepAndPrune.h diff --git a/cortex-9.0.0-a6/include/IECore/SweepAndPrune.inl b/cortex-9.0.0-a10/include/IECore/SweepAndPrune.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/SweepAndPrune.inl rename to cortex-9.0.0-a10/include/IECore/SweepAndPrune.inl diff --git a/cortex-9.0.0-a6/include/IECore/TGAImageReader.h b/cortex-9.0.0-a10/include/IECore/TGAImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TGAImageReader.h rename to cortex-9.0.0-a10/include/IECore/TGAImageReader.h diff --git a/cortex-9.0.0-a6/include/IECore/TGAImageWriter.h b/cortex-9.0.0-a10/include/IECore/TGAImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TGAImageWriter.h rename to cortex-9.0.0-a10/include/IECore/TGAImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/TIFFImageReader.h b/cortex-9.0.0-a10/include/IECore/TIFFImageReader.h similarity index 99% rename from cortex-9.0.0-a6/include/IECore/TIFFImageReader.h rename to cortex-9.0.0-a10/include/IECore/TIFFImageReader.h index a7d6d2b34f..dd983442ee 100644 --- a/cortex-9.0.0-a6/include/IECore/TIFFImageReader.h +++ b/cortex-9.0.0-a10/include/IECore/TIFFImageReader.h @@ -142,6 +142,8 @@ class TIFFImageReader : public ImageReader int m_sampleFormat; int m_orientation; int m_planarConfig; + std::string m_software; + std::string m_imageDescription; std::vector m_extraSamples; template diff --git a/cortex-9.0.0-a6/include/IECore/TIFFImageWriter.h b/cortex-9.0.0-a10/include/IECore/TIFFImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TIFFImageWriter.h rename to cortex-9.0.0-a10/include/IECore/TIFFImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/TestTypedData.h b/cortex-9.0.0-a10/include/IECore/TestTypedData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TestTypedData.h rename to cortex-9.0.0-a10/include/IECore/TestTypedData.h diff --git a/cortex-9.0.0-a6/include/IECore/TestTypedData.inl b/cortex-9.0.0-a10/include/IECore/TestTypedData.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TestTypedData.inl rename to cortex-9.0.0-a10/include/IECore/TestTypedData.inl diff --git a/cortex-9.0.0-a6/include/IECore/TetrahedronAlgo.h b/cortex-9.0.0-a10/include/IECore/TetrahedronAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TetrahedronAlgo.h rename to cortex-9.0.0-a10/include/IECore/TetrahedronAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/TetrahedronAlgo.inl b/cortex-9.0.0-a10/include/IECore/TetrahedronAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TetrahedronAlgo.inl rename to cortex-9.0.0-a10/include/IECore/TetrahedronAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/TimeCodeData.h b/cortex-9.0.0-a10/include/IECore/TimeCodeData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimeCodeData.h rename to cortex-9.0.0-a10/include/IECore/TimeCodeData.h diff --git a/cortex-9.0.0-a6/include/IECore/TimeCodeParameter.h b/cortex-9.0.0-a10/include/IECore/TimeCodeParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimeCodeParameter.h rename to cortex-9.0.0-a10/include/IECore/TimeCodeParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/TimeDurationData.h b/cortex-9.0.0-a10/include/IECore/TimeDurationData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimeDurationData.h rename to cortex-9.0.0-a10/include/IECore/TimeDurationData.h diff --git a/cortex-9.0.0-a6/include/IECore/TimeDurationParameter.h b/cortex-9.0.0-a10/include/IECore/TimeDurationParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimeDurationParameter.h rename to cortex-9.0.0-a10/include/IECore/TimeDurationParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/TimePeriod.h b/cortex-9.0.0-a10/include/IECore/TimePeriod.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimePeriod.h rename to cortex-9.0.0-a10/include/IECore/TimePeriod.h diff --git a/cortex-9.0.0-a6/include/IECore/TimePeriodData.h b/cortex-9.0.0-a10/include/IECore/TimePeriodData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimePeriodData.h rename to cortex-9.0.0-a10/include/IECore/TimePeriodData.h diff --git a/cortex-9.0.0-a6/include/IECore/TimePeriodParameter.h b/cortex-9.0.0-a10/include/IECore/TimePeriodParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TimePeriodParameter.h rename to cortex-9.0.0-a10/include/IECore/TimePeriodParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/Timer.h b/cortex-9.0.0-a10/include/IECore/Timer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Timer.h rename to cortex-9.0.0-a10/include/IECore/Timer.h diff --git a/cortex-9.0.0-a6/include/IECore/ToCoreConverter.h b/cortex-9.0.0-a10/include/IECore/ToCoreConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ToCoreConverter.h rename to cortex-9.0.0-a10/include/IECore/ToCoreConverter.h diff --git a/cortex-9.0.0-a6/include/IECore/TransferSmoothSkinningWeightsOp.h b/cortex-9.0.0-a10/include/IECore/TransferSmoothSkinningWeightsOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransferSmoothSkinningWeightsOp.h rename to cortex-9.0.0-a10/include/IECore/TransferSmoothSkinningWeightsOp.h diff --git a/cortex-9.0.0-a6/include/IECore/Transform.h b/cortex-9.0.0-a10/include/IECore/Transform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Transform.h rename to cortex-9.0.0-a10/include/IECore/Transform.h diff --git a/cortex-9.0.0-a6/include/IECore/TransformBlock.h b/cortex-9.0.0-a10/include/IECore/TransformBlock.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformBlock.h rename to cortex-9.0.0-a10/include/IECore/TransformBlock.h diff --git a/cortex-9.0.0-a6/include/IECore/TransformOp.h b/cortex-9.0.0-a10/include/IECore/TransformOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformOp.h rename to cortex-9.0.0-a10/include/IECore/TransformOp.h diff --git a/cortex-9.0.0-a6/include/IECore/TransformationMatrix.h b/cortex-9.0.0-a10/include/IECore/TransformationMatrix.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformationMatrix.h rename to cortex-9.0.0-a10/include/IECore/TransformationMatrix.h diff --git a/cortex-9.0.0-a6/include/IECore/TransformationMatrix.inl b/cortex-9.0.0-a10/include/IECore/TransformationMatrix.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformationMatrix.inl rename to cortex-9.0.0-a10/include/IECore/TransformationMatrix.inl diff --git a/cortex-9.0.0-a6/include/IECore/TransformationMatrixData.h b/cortex-9.0.0-a10/include/IECore/TransformationMatrixData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformationMatrixData.h rename to cortex-9.0.0-a10/include/IECore/TransformationMatrixData.h diff --git a/cortex-9.0.0-a6/include/IECore/TransformationMatrixInterpolator.inl b/cortex-9.0.0-a10/include/IECore/TransformationMatrixInterpolator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TransformationMatrixInterpolator.inl rename to cortex-9.0.0-a10/include/IECore/TransformationMatrixInterpolator.inl diff --git a/cortex-9.0.0-a6/include/IECore/TriangleAlgo.h b/cortex-9.0.0-a10/include/IECore/TriangleAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TriangleAlgo.h rename to cortex-9.0.0-a10/include/IECore/TriangleAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/TriangleAlgo.inl b/cortex-9.0.0-a10/include/IECore/TriangleAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TriangleAlgo.inl rename to cortex-9.0.0-a10/include/IECore/TriangleAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/TriangulateOp.h b/cortex-9.0.0-a10/include/IECore/TriangulateOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TriangulateOp.h rename to cortex-9.0.0-a10/include/IECore/TriangulateOp.h diff --git a/cortex-9.0.0-a6/include/IECore/Triangulator.h b/cortex-9.0.0-a10/include/IECore/Triangulator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Triangulator.h rename to cortex-9.0.0-a10/include/IECore/Triangulator.h diff --git a/cortex-9.0.0-a6/include/IECore/Triangulator.inl b/cortex-9.0.0-a10/include/IECore/Triangulator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Triangulator.inl rename to cortex-9.0.0-a10/include/IECore/Triangulator.inl diff --git a/cortex-9.0.0-a6/include/IECore/Turbulence.h b/cortex-9.0.0-a10/include/IECore/Turbulence.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Turbulence.h rename to cortex-9.0.0-a10/include/IECore/Turbulence.h diff --git a/cortex-9.0.0-a6/include/IECore/Turbulence.inl b/cortex-9.0.0-a10/include/IECore/Turbulence.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Turbulence.inl rename to cortex-9.0.0-a10/include/IECore/Turbulence.inl diff --git a/cortex-9.0.0-a6/include/IECore/TypeIds.h b/cortex-9.0.0-a10/include/IECore/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypeIds.h rename to cortex-9.0.0-a10/include/IECore/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECore/TypeInfoCmp.h b/cortex-9.0.0-a10/include/IECore/TypeInfoCmp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypeInfoCmp.h rename to cortex-9.0.0-a10/include/IECore/TypeInfoCmp.h diff --git a/cortex-9.0.0-a6/include/IECore/TypeTraits.h b/cortex-9.0.0-a10/include/IECore/TypeTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypeTraits.h rename to cortex-9.0.0-a10/include/IECore/TypeTraits.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedData.h b/cortex-9.0.0-a10/include/IECore/TypedData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedData.h rename to cortex-9.0.0-a10/include/IECore/TypedData.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedData.inl b/cortex-9.0.0-a10/include/IECore/TypedData.inl similarity index 90% rename from cortex-9.0.0-a6/include/IECore/TypedData.inl rename to cortex-9.0.0-a10/include/IECore/TypedData.inl index bfc08632f5..d6309493fd 100644 --- a/cortex-9.0.0-a6/include/IECore/TypedData.inl +++ b/cortex-9.0.0-a10/include/IECore/TypedData.inl @@ -66,6 +66,18 @@ inline size_t sizeOf() return 0; } +template +inline bool shareable( const T &t ) +{ + return false; +} + +template +inline bool shareable( const SharedDataHolder &t ) +{ + return true; +} + } // namespace Detail ////////////////////////////////////////////////////////////////////////////////////// @@ -184,7 +196,21 @@ template void TypedData::memoryUsage( Object::MemoryAccumulator &accumulator ) const { Data::memoryUsage( accumulator ); - accumulator.accumulate( &readable(), sizeof( T ) ); + if( Detail::shareable( m_data ) ) + { + // We may be sharing our data with another object using + // lazy-copy-on-write. We must tell the MemoryAccumulator + // what address our storage is at, so it can avoid double + // counting. + accumulator.accumulate( &readable(), sizeof( T ) ); + } + else + { + // We store our own copy of the data - by not passing + // an address associated with the size we avoid + // unnecessary bookkeeping in the MemoryAccumulator. + accumulator.accumulate( sizeof( T ) ); + } } ////////////////////////////////////////////////////////////////////////////////////// diff --git a/cortex-9.0.0-a6/include/IECore/TypedDataInternals.h b/cortex-9.0.0-a10/include/IECore/TypedDataInternals.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedDataInternals.h rename to cortex-9.0.0-a10/include/IECore/TypedDataInternals.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedDataInterpolator.inl b/cortex-9.0.0-a10/include/IECore/TypedDataInterpolator.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedDataInterpolator.inl rename to cortex-9.0.0-a10/include/IECore/TypedDataInterpolator.inl diff --git a/cortex-9.0.0-a6/include/IECore/TypedObjectParameter.h b/cortex-9.0.0-a10/include/IECore/TypedObjectParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedObjectParameter.h rename to cortex-9.0.0-a10/include/IECore/TypedObjectParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedObjectParameter.inl b/cortex-9.0.0-a10/include/IECore/TypedObjectParameter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedObjectParameter.inl rename to cortex-9.0.0-a10/include/IECore/TypedObjectParameter.inl diff --git a/cortex-9.0.0-a6/include/IECore/TypedParameter.h b/cortex-9.0.0-a10/include/IECore/TypedParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedParameter.h rename to cortex-9.0.0-a10/include/IECore/TypedParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedParameter.inl b/cortex-9.0.0-a10/include/IECore/TypedParameter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedParameter.inl rename to cortex-9.0.0-a10/include/IECore/TypedParameter.inl diff --git a/cortex-9.0.0-a6/include/IECore/TypedParameterInternals.h b/cortex-9.0.0-a10/include/IECore/TypedParameterInternals.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedParameterInternals.h rename to cortex-9.0.0-a10/include/IECore/TypedParameterInternals.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedPrimitiveOp.h b/cortex-9.0.0-a10/include/IECore/TypedPrimitiveOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedPrimitiveOp.h rename to cortex-9.0.0-a10/include/IECore/TypedPrimitiveOp.h diff --git a/cortex-9.0.0-a6/include/IECore/TypedPrimitiveParameter.h b/cortex-9.0.0-a10/include/IECore/TypedPrimitiveParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/TypedPrimitiveParameter.h rename to cortex-9.0.0-a10/include/IECore/TypedPrimitiveParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/UVDistortOp.h b/cortex-9.0.0-a10/include/IECore/UVDistortOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/UVDistortOp.h rename to cortex-9.0.0-a10/include/IECore/UVDistortOp.h diff --git a/cortex-9.0.0-a6/include/IECore/UniformRandomPointDistributionOp.h b/cortex-9.0.0-a10/include/IECore/UniformRandomPointDistributionOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/UniformRandomPointDistributionOp.h rename to cortex-9.0.0-a10/include/IECore/UniformRandomPointDistributionOp.h diff --git a/cortex-9.0.0-a6/include/IECore/ValidatedStringParameter.h b/cortex-9.0.0-a10/include/IECore/ValidatedStringParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/ValidatedStringParameter.h rename to cortex-9.0.0-a10/include/IECore/ValidatedStringParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/VecAlgo.h b/cortex-9.0.0-a10/include/IECore/VecAlgo.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VecAlgo.h rename to cortex-9.0.0-a10/include/IECore/VecAlgo.h diff --git a/cortex-9.0.0-a6/include/IECore/VecAlgo.inl b/cortex-9.0.0-a10/include/IECore/VecAlgo.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VecAlgo.inl rename to cortex-9.0.0-a10/include/IECore/VecAlgo.inl diff --git a/cortex-9.0.0-a6/include/IECore/VectorDataFilterOp.h b/cortex-9.0.0-a10/include/IECore/VectorDataFilterOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorDataFilterOp.h rename to cortex-9.0.0-a10/include/IECore/VectorDataFilterOp.h diff --git a/cortex-9.0.0-a6/include/IECore/VectorOps.h b/cortex-9.0.0-a10/include/IECore/VectorOps.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorOps.h rename to cortex-9.0.0-a10/include/IECore/VectorOps.h diff --git a/cortex-9.0.0-a6/include/IECore/VectorOps.inl b/cortex-9.0.0-a10/include/IECore/VectorOps.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorOps.inl rename to cortex-9.0.0-a10/include/IECore/VectorOps.inl diff --git a/cortex-9.0.0-a6/include/IECore/VectorTraits.h b/cortex-9.0.0-a10/include/IECore/VectorTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorTraits.h rename to cortex-9.0.0-a10/include/IECore/VectorTraits.h diff --git a/cortex-9.0.0-a6/include/IECore/VectorTypedData.h b/cortex-9.0.0-a10/include/IECore/VectorTypedData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorTypedData.h rename to cortex-9.0.0-a10/include/IECore/VectorTypedData.h diff --git a/cortex-9.0.0-a6/include/IECore/VectorTypedParameter.h b/cortex-9.0.0-a10/include/IECore/VectorTypedParameter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VectorTypedParameter.h rename to cortex-9.0.0-a10/include/IECore/VectorTypedParameter.h diff --git a/cortex-9.0.0-a6/include/IECore/VisibleRenderable.h b/cortex-9.0.0-a10/include/IECore/VisibleRenderable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/VisibleRenderable.h rename to cortex-9.0.0-a10/include/IECore/VisibleRenderable.h diff --git a/cortex-9.0.0-a6/include/IECore/WarpOp.h b/cortex-9.0.0-a10/include/IECore/WarpOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/WarpOp.h rename to cortex-9.0.0-a10/include/IECore/WarpOp.h diff --git a/cortex-9.0.0-a6/include/IECore/WorldBlock.h b/cortex-9.0.0-a10/include/IECore/WorldBlock.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/WorldBlock.h rename to cortex-9.0.0-a10/include/IECore/WorldBlock.h diff --git a/cortex-9.0.0-a6/include/IECore/Writer.h b/cortex-9.0.0-a10/include/IECore/Writer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Writer.h rename to cortex-9.0.0-a10/include/IECore/Writer.h diff --git a/cortex-9.0.0-a6/include/IECore/Writer.inl b/cortex-9.0.0-a10/include/IECore/Writer.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/Writer.inl rename to cortex-9.0.0-a10/include/IECore/Writer.inl diff --git a/cortex-9.0.0-a6/include/IECore/XYYToXYZColorTransform.h b/cortex-9.0.0-a10/include/IECore/XYYToXYZColorTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYYToXYZColorTransform.h rename to cortex-9.0.0-a10/include/IECore/XYYToXYZColorTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/XYYToXYZColorTransform.inl b/cortex-9.0.0-a10/include/IECore/XYYToXYZColorTransform.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYYToXYZColorTransform.inl rename to cortex-9.0.0-a10/include/IECore/XYYToXYZColorTransform.inl diff --git a/cortex-9.0.0-a6/include/IECore/XYZToRGBColorTransform.h b/cortex-9.0.0-a10/include/IECore/XYZToRGBColorTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYZToRGBColorTransform.h rename to cortex-9.0.0-a10/include/IECore/XYZToRGBColorTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/XYZToRGBColorTransform.inl b/cortex-9.0.0-a10/include/IECore/XYZToRGBColorTransform.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYZToRGBColorTransform.inl rename to cortex-9.0.0-a10/include/IECore/XYZToRGBColorTransform.inl diff --git a/cortex-9.0.0-a6/include/IECore/XYZToXYYColorTransform.h b/cortex-9.0.0-a10/include/IECore/XYZToXYYColorTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYZToXYYColorTransform.h rename to cortex-9.0.0-a10/include/IECore/XYZToXYYColorTransform.h diff --git a/cortex-9.0.0-a6/include/IECore/XYZToXYYColorTransform.inl b/cortex-9.0.0-a10/include/IECore/XYZToXYYColorTransform.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECore/XYZToXYYColorTransform.inl rename to cortex-9.0.0-a10/include/IECore/XYZToXYYColorTransform.inl diff --git a/cortex-9.0.0-a6/include/IECore/YUVImageWriter.h b/cortex-9.0.0-a10/include/IECore/YUVImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/YUVImageWriter.h rename to cortex-9.0.0-a10/include/IECore/YUVImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECore/private/DisplayDriverServerHeader.h b/cortex-9.0.0-a10/include/IECore/private/DisplayDriverServerHeader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/private/DisplayDriverServerHeader.h rename to cortex-9.0.0-a10/include/IECore/private/DisplayDriverServerHeader.h diff --git a/cortex-9.0.0-a6/include/IECore/private/ScopedTIFFErrorHandler.h b/cortex-9.0.0-a10/include/IECore/private/ScopedTIFFErrorHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/private/ScopedTIFFErrorHandler.h rename to cortex-9.0.0-a10/include/IECore/private/ScopedTIFFErrorHandler.h diff --git a/cortex-9.0.0-a6/include/IECore/private/cineon.h b/cortex-9.0.0-a10/include/IECore/private/cineon.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/private/cineon.h rename to cortex-9.0.0-a10/include/IECore/private/cineon.h diff --git a/cortex-9.0.0-a6/include/IECore/private/dpx.h b/cortex-9.0.0-a10/include/IECore/private/dpx.h similarity index 100% rename from cortex-9.0.0-a6/include/IECore/private/dpx.h rename to cortex-9.0.0-a10/include/IECore/private/dpx.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/AlphaTexture.h b/cortex-9.0.0-a10/include/IECoreGL/AlphaTexture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/AlphaTexture.h rename to cortex-9.0.0-a10/include/IECoreGL/AlphaTexture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Bindable.h b/cortex-9.0.0-a10/include/IECoreGL/Bindable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Bindable.h rename to cortex-9.0.0-a10/include/IECoreGL/Bindable.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/BoxPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/BoxPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/BoxPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/BoxPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Buffer.h b/cortex-9.0.0-a10/include/IECoreGL/Buffer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Buffer.h rename to cortex-9.0.0-a10/include/IECoreGL/Buffer.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/CachedConverter.h b/cortex-9.0.0-a10/include/IECoreGL/CachedConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/CachedConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/CachedConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Camera.h b/cortex-9.0.0-a10/include/IECoreGL/Camera.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Camera.h rename to cortex-9.0.0-a10/include/IECoreGL/Camera.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ColorTexture.h b/cortex-9.0.0-a10/include/IECoreGL/ColorTexture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ColorTexture.h rename to cortex-9.0.0-a10/include/IECoreGL/ColorTexture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/CurvesPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/CurvesPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/CurvesPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/CurvesPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Debug.h b/cortex-9.0.0-a10/include/IECoreGL/Debug.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Debug.h rename to cortex-9.0.0-a10/include/IECoreGL/Debug.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/DepthTexture.h b/cortex-9.0.0-a10/include/IECoreGL/DepthTexture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/DepthTexture.h rename to cortex-9.0.0-a10/include/IECoreGL/DepthTexture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/DiskPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/DiskPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/DiskPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/DiskPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Exception.h b/cortex-9.0.0-a10/include/IECoreGL/Exception.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Exception.h rename to cortex-9.0.0-a10/include/IECoreGL/Exception.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Font.h b/cortex-9.0.0-a10/include/IECoreGL/Font.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Font.h rename to cortex-9.0.0-a10/include/IECoreGL/Font.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/FontLoader.h b/cortex-9.0.0-a10/include/IECoreGL/FontLoader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/FontLoader.h rename to cortex-9.0.0-a10/include/IECoreGL/FontLoader.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/FrameBuffer.h b/cortex-9.0.0-a10/include/IECoreGL/FrameBuffer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/FrameBuffer.h rename to cortex-9.0.0-a10/include/IECoreGL/FrameBuffer.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/GL.h b/cortex-9.0.0-a10/include/IECoreGL/GL.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/GL.h rename to cortex-9.0.0-a10/include/IECoreGL/GL.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/GL.inl b/cortex-9.0.0-a10/include/IECoreGL/GL.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/GL.inl rename to cortex-9.0.0-a10/include/IECoreGL/GL.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/Group.h b/cortex-9.0.0-a10/include/IECoreGL/Group.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Group.h rename to cortex-9.0.0-a10/include/IECoreGL/Group.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/HitRecord.h b/cortex-9.0.0-a10/include/IECoreGL/HitRecord.h similarity index 89% rename from cortex-9.0.0-a6/include/IECoreGL/HitRecord.h rename to cortex-9.0.0-a10/include/IECoreGL/HitRecord.h index 36ea3139a2..8878ca5e35 100644 --- a/cortex-9.0.0-a6/include/IECoreGL/HitRecord.h +++ b/cortex-9.0.0-a10/include/IECoreGL/HitRecord.h @@ -53,18 +53,15 @@ class HitRecord /// for the OpenGL select buffer. Raises an exception if /// more than one name is specified in the record. HitRecord( const GLuint *hitRecord ); - HitRecord( float dMin, float dMax, const IECore::InternedString &primName ); + HitRecord( float dMin, float dMax, GLuint name ); /// The minimum and maximum depths of the hit, normalised /// in the 0-1 range between the near and far clipping planes. float depthMin; float depthMax; - /// Unlike the gl hit record, the HitRecord stores - /// only one name - this is because the NameStateComponent - /// and the Renderer "name" attribute specify only a single - /// name for each primitive rendered. - IECore::InternedString name; + /// Identifier for the hit object. + GLuint name; /// Performs comparison based on the depth.min member. bool operator < ( const HitRecord &other ) const; diff --git a/cortex-9.0.0-a6/include/IECoreGL/IECoreGL.h b/cortex-9.0.0-a10/include/IECoreGL/IECoreGL.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/IECoreGL.h rename to cortex-9.0.0-a10/include/IECoreGL/IECoreGL.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/LuminanceTexture.h b/cortex-9.0.0-a10/include/IECoreGL/LuminanceTexture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/LuminanceTexture.h rename to cortex-9.0.0-a10/include/IECoreGL/LuminanceTexture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/MeshPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/MeshPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/MeshPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/MeshPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/NameStateComponent.h b/cortex-9.0.0-a10/include/IECoreGL/NameStateComponent.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/NameStateComponent.h rename to cortex-9.0.0-a10/include/IECoreGL/NameStateComponent.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/NumericTraits.h b/cortex-9.0.0-a10/include/IECoreGL/NumericTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/NumericTraits.h rename to cortex-9.0.0-a10/include/IECoreGL/NumericTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/OrthographicCamera.h b/cortex-9.0.0-a10/include/IECoreGL/OrthographicCamera.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/OrthographicCamera.h rename to cortex-9.0.0-a10/include/IECoreGL/OrthographicCamera.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/PerspectiveCamera.h b/cortex-9.0.0-a10/include/IECoreGL/PerspectiveCamera.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/PerspectiveCamera.h rename to cortex-9.0.0-a10/include/IECoreGL/PerspectiveCamera.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/PointsPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/PointsPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/PointsPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/PointsPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Primitive.h b/cortex-9.0.0-a10/include/IECoreGL/Primitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Primitive.h rename to cortex-9.0.0-a10/include/IECoreGL/Primitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/QuadPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/QuadPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/QuadPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/QuadPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Renderable.h b/cortex-9.0.0-a10/include/IECoreGL/Renderable.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Renderable.h rename to cortex-9.0.0-a10/include/IECoreGL/Renderable.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Renderer.h b/cortex-9.0.0-a10/include/IECoreGL/Renderer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Renderer.h rename to cortex-9.0.0-a10/include/IECoreGL/Renderer.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Scene.h b/cortex-9.0.0-a10/include/IECoreGL/Scene.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Scene.h rename to cortex-9.0.0-a10/include/IECoreGL/Scene.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Selector.h b/cortex-9.0.0-a10/include/IECoreGL/Selector.h similarity index 95% rename from cortex-9.0.0-a6/include/IECoreGL/Selector.h rename to cortex-9.0.0-a10/include/IECoreGL/Selector.h index 2cd0640b05..d44da229fd 100644 --- a/cortex-9.0.0-a6/include/IECoreGL/Selector.h +++ b/cortex-9.0.0-a10/include/IECoreGL/Selector.h @@ -107,6 +107,10 @@ class Selector : boost::noncopyable /// If rendering a Scene, this will be called automatically /// by the NameStateComponents within the Scene. void loadName( GLuint name ); + /// Generates a new name (by incrementing an internal counter) and + /// loads and returns it. No guarantee is made that generated names + /// will not clash with names loaded explicitly with the method above. + GLuint loadName(); /// A State that should be used as the base state for /// selection drawing. diff --git a/cortex-9.0.0-a6/include/IECoreGL/Shader.h b/cortex-9.0.0-a10/include/IECoreGL/Shader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Shader.h rename to cortex-9.0.0-a10/include/IECoreGL/Shader.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ShaderLoader.h b/cortex-9.0.0-a10/include/IECoreGL/ShaderLoader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ShaderLoader.h rename to cortex-9.0.0-a10/include/IECoreGL/ShaderLoader.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ShaderStateComponent.h b/cortex-9.0.0-a10/include/IECoreGL/ShaderStateComponent.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ShaderStateComponent.h rename to cortex-9.0.0-a10/include/IECoreGL/ShaderStateComponent.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/SpherePrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/SpherePrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/SpherePrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/SpherePrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/SplineToGLTextureConverter.h b/cortex-9.0.0-a10/include/IECoreGL/SplineToGLTextureConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/SplineToGLTextureConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/SplineToGLTextureConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/State.h b/cortex-9.0.0-a10/include/IECoreGL/State.h similarity index 96% rename from cortex-9.0.0-a6/include/IECoreGL/State.h rename to cortex-9.0.0-a10/include/IECoreGL/State.h index f2ffb385fe..3d6afc73b3 100644 --- a/cortex-9.0.0-a6/include/IECoreGL/State.h +++ b/cortex-9.0.0-a10/include/IECoreGL/State.h @@ -62,12 +62,16 @@ class State : public Bindable /// new bindings. It is the caller's responsibility to keep both arguments /// alive until after destruction of the ScopedBinding. ScopedBinding( const State &s, State ¤tState ); + /// As above, but does nothing if bind is false. + ScopedBinding( const State &s, State ¤tState, bool bind ); /// Reverts the state changes and modifications to currentState /// made by the constructor. ~ScopedBinding(); private : + void init( const State &s, bool bind = true ); + State &m_currentState; std::vector m_savedComponents; diff --git a/cortex-9.0.0-a6/include/IECoreGL/State.inl b/cortex-9.0.0-a10/include/IECoreGL/State.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/State.inl rename to cortex-9.0.0-a10/include/IECoreGL/State.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/StateComponent.h b/cortex-9.0.0-a10/include/IECoreGL/StateComponent.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/StateComponent.h rename to cortex-9.0.0-a10/include/IECoreGL/StateComponent.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/StateComponent.inl b/cortex-9.0.0-a10/include/IECoreGL/StateComponent.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/StateComponent.inl rename to cortex-9.0.0-a10/include/IECoreGL/StateComponent.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/TextPrimitive.h b/cortex-9.0.0-a10/include/IECoreGL/TextPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/TextPrimitive.h rename to cortex-9.0.0-a10/include/IECoreGL/TextPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/Texture.h b/cortex-9.0.0-a10/include/IECoreGL/Texture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/Texture.h rename to cortex-9.0.0-a10/include/IECoreGL/Texture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/TextureLoader.h b/cortex-9.0.0-a10/include/IECoreGL/TextureLoader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/TextureLoader.h rename to cortex-9.0.0-a10/include/IECoreGL/TextureLoader.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLBufferConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLBufferConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLBufferConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLBufferConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLCameraConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLCameraConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLCameraConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLConverter.inl b/cortex-9.0.0-a10/include/IECoreGL/ToGLConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLConverter.inl rename to cortex-9.0.0-a10/include/IECoreGL/ToGLConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLCurvesConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLCurvesConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLCurvesConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLCurvesConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLMeshConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLMeshConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLMeshConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLMeshConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLPointsConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLPointsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLPointsConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLPointsConverter.h diff --git a/cortex-9.0.0-a6/include/IECore/HashTable.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLStateConverter.h similarity index 53% rename from cortex-9.0.0-a6/include/IECore/HashTable.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLStateConverter.h index 950e120741..d4c1a448b9 100644 --- a/cortex-9.0.0-a6/include/IECore/HashTable.h +++ b/cortex-9.0.0-a10/include/IECoreGL/ToGLStateConverter.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2007, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2014, 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,91 +32,53 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_HASHTABLE_H -#define IE_CORE_HASHTABLE_H +#ifndef IECOREGL_TOGLSTATECONVERTER_H +#define IECOREGL_TOGLSTATECONVERTER_H -#include -#include -#include - -#include "boost/static_assert.hpp" -#include "boost/multi_index_container.hpp" -#include "boost/multi_index/hashed_index.hpp" -#include "boost/multi_index/member.hpp" +#include "IECoreGL/ToGLConverter.h" namespace IECore { +IE_CORE_FORWARDDECLARE( CompoundObject ) +IE_CORE_FORWARDDECLARE( Data ) -template -struct Hash -{ - size_t operator()( const T &s ) const - { - return static_cast(s); - } -}; +} // namespace IECore -template -struct Hash +namespace IECoreGL { - size_t operator()( const T *s ) const - { - return reinterpret_cast(s); - } -}; -template<> -struct Hash -{ - /// Dan Bernstein's original string hash - size_t operator()( const char *s ) const - { - assert(s); - size_t hash = 5381; - while (*s) - { - hash = ( ( hash << 5 ) + hash ) + *s++; - } - - return hash; - } -}; +IE_CORE_FORWARDDECLARE( State ) +IE_CORE_FORWARDDECLARE( StateComponent ) -template<> -struct Hash +/// Converts IECore::CompoundObject objects containing shaders and attributes +/// into IECoreGL::State objects. +/// \ingroup conversionGroup +class ToGLStateConverter : public ToGLConverter { - /// Dan Bernstein's original string hash - size_t operator()( const std::string &s ) const - { - size_t hash = 5381; - for ( std::string::size_type i = 0; i < s.length(); i++) - { - hash = ( ( hash << 5 ) + hash ) + s[i]; - } - - return hash; - } -}; + public : + + typedef IECore::CompoundObject InputType; + typedef IECoreGL::State ResultType; + + IE_CORE_DECLARERUNTIMETYPEDEXTENSION( IECoreGL::ToGLStateConverter, ToGLStateConverterTypeId, ToGLConverter ); + + ToGLStateConverter( IECore::ConstCompoundObjectPtr toConvert = NULL ); + virtual ~ToGLStateConverter(); + + protected : + + virtual IECore::RunTimeTypedPtr doConversion( IECore::ConstObjectPtr src, IECore::ConstCompoundObjectPtr operands ) const; + + private : + + static ConverterDescription g_description; -template > -struct HashTable : public boost::multi_index::multi_index_container - < - std::pair< Key, Data >, - boost::multi_index::indexed_by< - boost::multi_index::hashed_non_unique< - boost::multi_index::member, Key, &std::pair< Key, Data >::first>, - HashFn - > - > - > -{ - typedef Key key_type; - typedef Data data_type; - typedef std::pair< Key, Data > value_type; }; -} // namespace IECore +IE_CORE_DECLAREPTR( ToGLStateConverter ); + +} // namespace IECoreGL -#endif // IE_CORE_HASHTABLE_H +#endif // IECOREGL_TOGLSTATECONVERTER_H diff --git a/cortex-9.0.0-a6/include/IECoreGL/ToGLTextureConverter.h b/cortex-9.0.0-a10/include/IECoreGL/ToGLTextureConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/ToGLTextureConverter.h rename to cortex-9.0.0-a10/include/IECoreGL/ToGLTextureConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/TypeIds.h b/cortex-9.0.0-a10/include/IECoreGL/TypeIds.h similarity index 99% rename from cortex-9.0.0-a6/include/IECoreGL/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreGL/TypeIds.h index 83b81b4c34..5a3c30b288 100644 --- a/cortex-9.0.0-a6/include/IECoreGL/TypeIds.h +++ b/cortex-9.0.0-a10/include/IECoreGL/TypeIds.h @@ -121,6 +121,7 @@ enum TypeId ToGLBufferConverterTypeId = 105078, UIntTextureTypeId = 105079, PrimitiveSelectableTypeId = 105080, + ToGLStateConverterTypeId = 105081, LastCoreGLTypeId = 105999, }; diff --git a/cortex-9.0.0-a6/include/IECoreGL/TypedStateComponent.h b/cortex-9.0.0-a10/include/IECoreGL/TypedStateComponent.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/TypedStateComponent.h rename to cortex-9.0.0-a10/include/IECoreGL/TypedStateComponent.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/TypedStateComponent.inl b/cortex-9.0.0-a10/include/IECoreGL/TypedStateComponent.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/TypedStateComponent.inl rename to cortex-9.0.0-a10/include/IECoreGL/TypedStateComponent.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/UIntTexture.h b/cortex-9.0.0-a10/include/IECoreGL/UIntTexture.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/UIntTexture.h rename to cortex-9.0.0-a10/include/IECoreGL/UIntTexture.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/UniformFunctions.h b/cortex-9.0.0-a10/include/IECoreGL/UniformFunctions.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/UniformFunctions.h rename to cortex-9.0.0-a10/include/IECoreGL/UniformFunctions.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/AlphaTextureBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/AlphaTextureBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/AlphaTextureBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/AlphaTextureBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/BindableBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/BindableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/BindableBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/BindableBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/BufferBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/BufferBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/BufferBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/BufferBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/CachedConverterBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/CachedConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/CachedConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/CachedConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/CameraBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/CameraBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/CameraBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/CameraBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/ColorTextureBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/ColorTextureBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/ColorTextureBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/ColorTextureBinding.h diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/Specular.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/CurvesPrimitiveBinding.h similarity index 78% rename from cortex-9.0.0-a6/glsl/IECoreGL/Specular.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/CurvesPrimitiveBinding.h index 35688ea023..77b3a039dd 100644 --- a/cortex-9.0.0-a6/glsl/IECoreGL/Specular.h +++ b/cortex-9.0.0-a10/include/IECoreGL/bindings/CurvesPrimitiveBinding.h @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2007-2010, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2014, 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,14 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SPECULAR_H -#define IECOREGL_SPECULAR_H +#ifndef IECOREGL_CURVESPRIMITIVEBINDING_H +#define IECOREGL_CURVESPRIMITIVEBINDING_H -vec3 ieSpecular( vec3 P, vec3 N, vec3 V, float roughness, vec3 Cl[gl_MaxLights], vec3 L[gl_MaxLights], int nLights ) +namespace IECoreGL { - vec3 result = vec3( 0 ); - for( int i=0 ; i +#ifndef IECOREGL_TOGLSTATECONVERTERBINDING_H +#define IECOREGL_TOGLSTATECONVERTERBINDING_H namespace IECoreGL { -/// Returns a vector containing GL_TEXTURE0, GL_TEXTURE1, ... -/// GL_TEXTUREN for all texture unit enums up to -/// GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1. That way you can -/// actually program texture code like a grown up, -/// using like loops and stuff. -const std::vector &textureUnits(); +void bindToGLStateConverter(); } // namespace IECoreGL -#endif // IECOREGL_TEXTUREUNITS_H +#endif // IECOREGL_TOGLSTATECONVERTERBINDING_H diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/ToGLTextureConverterBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/ToGLTextureConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/ToGLTextureConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/ToGLTextureConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/TypedStateComponentBinding.h b/cortex-9.0.0-a10/include/IECoreGL/bindings/TypedStateComponentBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/TypedStateComponentBinding.h rename to cortex-9.0.0-a10/include/IECoreGL/bindings/TypedStateComponentBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/bindings/TypedStateComponentBinding.inl b/cortex-9.0.0-a10/include/IECoreGL/bindings/TypedStateComponentBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/bindings/TypedStateComponentBinding.inl rename to cortex-9.0.0-a10/include/IECoreGL/bindings/TypedStateComponentBinding.inl diff --git a/cortex-9.0.0-a6/include/IECoreGL/private/DeferredRendererImplementation.h b/cortex-9.0.0-a10/include/IECoreGL/private/DeferredRendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/private/DeferredRendererImplementation.h rename to cortex-9.0.0-a10/include/IECoreGL/private/DeferredRendererImplementation.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/private/Display.h b/cortex-9.0.0-a10/include/IECoreGL/private/Display.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/private/Display.h rename to cortex-9.0.0-a10/include/IECoreGL/private/Display.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/private/ImmediateRendererImplementation.h b/cortex-9.0.0-a10/include/IECoreGL/private/ImmediateRendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/private/ImmediateRendererImplementation.h rename to cortex-9.0.0-a10/include/IECoreGL/private/ImmediateRendererImplementation.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/private/RendererImplementation.h b/cortex-9.0.0-a10/include/IECoreGL/private/RendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/private/RendererImplementation.h rename to cortex-9.0.0-a10/include/IECoreGL/private/RendererImplementation.h diff --git a/cortex-9.0.0-a6/include/IECoreGL/private/RendererImplementation.inl b/cortex-9.0.0-a10/include/IECoreGL/private/RendererImplementation.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreGL/private/RendererImplementation.inl rename to cortex-9.0.0-a10/include/IECoreGL/private/RendererImplementation.inl diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/Convert.h b/cortex-9.0.0-a10/include/IECoreHoudini/Convert.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/Convert.h rename to cortex-9.0.0-a10/include/IECoreHoudini/Convert.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/CoreHoudini.h b/cortex-9.0.0-a10/include/IECoreHoudini/CoreHoudini.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/CoreHoudini.h rename to cortex-9.0.0-a10/include/IECoreHoudini/CoreHoudini.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/DetailSplitter.h b/cortex-9.0.0-a10/include/IECoreHoudini/DetailSplitter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/DetailSplitter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/DetailSplitter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FnParameterisedHolder.h b/cortex-9.0.0-a10/include/IECoreHoudini/FnParameterisedHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FnParameterisedHolder.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FnParameterisedHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCortexObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCurvesConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCurvesConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniCurvesConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniCurvesConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGeometryConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGeometryConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGeometryConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGeometryConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGeometryConverter.inl b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGeometryConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGeometryConverter.inl rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGeometryConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGroupConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGroupConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniGroupConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniGroupConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniPointsConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniPointsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniPointsConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniPointsConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniPolygonsConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniPolygonsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/FromHoudiniPolygonsConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/FromHoudiniPolygonsConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GEO_CobIOTranslator.h b/cortex-9.0.0-a10/include/IECoreHoudini/GEO_CobIOTranslator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GEO_CobIOTranslator.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GEO_CobIOTranslator.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GEO_CortexPrimitive.h b/cortex-9.0.0-a10/include/IECoreHoudini/GEO_CortexPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GEO_CortexPrimitive.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GEO_CortexPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GR_Cortex.h b/cortex-9.0.0-a10/include/IECoreHoudini/GR_Cortex.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GR_Cortex.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GR_Cortex.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GR_CortexPrimitive.h b/cortex-9.0.0-a10/include/IECoreHoudini/GR_CortexPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GR_CortexPrimitive.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GR_CortexPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GUI_CortexPrimitiveHook.h b/cortex-9.0.0-a10/include/IECoreHoudini/GUI_CortexPrimitiveHook.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GUI_CortexPrimitiveHook.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GUI_CortexPrimitiveHook.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/GU_CortexPrimitive.h b/cortex-9.0.0-a10/include/IECoreHoudini/GU_CortexPrimitive.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/GU_CortexPrimitive.h rename to cortex-9.0.0-a10/include/IECoreHoudini/GU_CortexPrimitive.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/LiveScene.h b/cortex-9.0.0-a10/include/IECoreHoudini/LiveScene.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/LiveScene.h rename to cortex-9.0.0-a10/include/IECoreHoudini/LiveScene.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/MessageHandler.h b/cortex-9.0.0-a10/include/IECoreHoudini/MessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/MessageHandler.h rename to cortex-9.0.0-a10/include/IECoreHoudini/MessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/NodeHandle.h b/cortex-9.0.0-a10/include/IECoreHoudini/NodeHandle.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/NodeHandle.h rename to cortex-9.0.0-a10/include/IECoreHoudini/NodeHandle.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheGeometry.h b/cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheGeometry.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheGeometry.h rename to cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheGeometry.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheNode.h b/cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheNode.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheNode.h rename to cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheNode.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheTransform.h b/cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/OBJ_SceneCacheTransform.h rename to cortex-9.0.0-a10/include/IECoreHoudini/OBJ_SceneCacheTransform.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ParameterisedHolder.h b/cortex-9.0.0-a10/include/IECoreHoudini/ParameterisedHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ParameterisedHolder.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ParameterisedHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ParameterisedHolderInterface.h b/cortex-9.0.0-a10/include/IECoreHoudini/ParameterisedHolderInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ParameterisedHolderInterface.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ParameterisedHolderInterface.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/RATDeepImageReader.h b/cortex-9.0.0-a10/include/IECoreHoudini/RATDeepImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/RATDeepImageReader.h rename to cortex-9.0.0-a10/include/IECoreHoudini/RATDeepImageReader.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/RATDeepImageWriter.h b/cortex-9.0.0-a10/include/IECoreHoudini/RATDeepImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/RATDeepImageWriter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/RATDeepImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ROP_SceneCacheWriter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ROP_SceneCacheWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ROP_SceneCacheWriter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ROP_SceneCacheWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_CortexConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_CortexConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_CortexConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_CortexConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_InterpolatedCacheReader.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_InterpolatedCacheReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_InterpolatedCacheReader.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_InterpolatedCacheReader.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_OpHolder.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_OpHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_OpHolder.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_OpHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_ParameterisedHolder.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_ParameterisedHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_ParameterisedHolder.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_ParameterisedHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_ProceduralHolder.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_ProceduralHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_ProceduralHolder.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_ProceduralHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_SceneCacheSource.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_SceneCacheSource.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_SceneCacheSource.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_SceneCacheSource.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SOP_SceneCacheTransform.h b/cortex-9.0.0-a10/include/IECoreHoudini/SOP_SceneCacheTransform.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SOP_SceneCacheTransform.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SOP_SceneCacheTransform.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/SceneCacheNode.h b/cortex-9.0.0-a10/include/IECoreHoudini/SceneCacheNode.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/SceneCacheNode.h rename to cortex-9.0.0-a10/include/IECoreHoudini/SceneCacheNode.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniAttribConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniAttribConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniAttribConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniAttribConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniAttribConverter.inl b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniAttribConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniAttribConverter.inl rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniAttribConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCompoundObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCortexObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCurvesConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCurvesConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniCurvesConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniCurvesConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGeometryConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGeometryConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGeometryConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGeometryConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGeometryConverter.inl b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGeometryConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGeometryConverter.inl rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGeometryConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGroupConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGroupConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniGroupConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniGroupConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniNumericAttribConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniNumericAttribConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniPointsConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniPointsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniPointsConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniPointsConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniPolygonsConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniPolygonsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniPolygonsConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniPolygonsConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniStringAttribConverter.h b/cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniStringAttribConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/ToHoudiniStringAttribConverter.h rename to cortex-9.0.0-a10/include/IECoreHoudini/ToHoudiniStringAttribConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/TypeIds.h b/cortex-9.0.0-a10/include/IECoreHoudini/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreHoudini/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/TypeTraits.h b/cortex-9.0.0-a10/include/IECoreHoudini/TypeTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/TypeTraits.h rename to cortex-9.0.0-a10/include/IECoreHoudini/TypeTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/UT_ObjectPoolCache.h b/cortex-9.0.0-a10/include/IECoreHoudini/UT_ObjectPoolCache.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/UT_ObjectPoolCache.h rename to cortex-9.0.0-a10/include/IECoreHoudini/UT_ObjectPoolCache.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/LiveSceneBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/LiveSceneBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/LiveSceneBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/LiveSceneBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/RATDeepImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/RATDeepImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/SceneCacheNodeBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniGeometryConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreHoudini/bindings/TypeIdBinding.h b/cortex-9.0.0-a10/include/IECoreHoudini/bindings/TypeIdBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreHoudini/bindings/TypeIdBinding.h rename to cortex-9.0.0-a10/include/IECoreHoudini/bindings/TypeIdBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/BoolParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/BoolParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/BoolParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/BoolParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/Box3Manipulator.h b/cortex-9.0.0-a10/include/IECoreMaya/Box3Manipulator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/Box3Manipulator.h rename to cortex-9.0.0-a10/include/IECoreMaya/Box3Manipulator.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/BoxParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/BoxParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/BoxParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/BoxParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/BoxTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/BoxTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/BoxTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/BoxTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/CacheSet.h b/cortex-9.0.0-a10/include/IECoreMaya/CacheSet.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/CacheSet.h rename to cortex-9.0.0-a10/include/IECoreMaya/CacheSet.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/CallbackId.h b/cortex-9.0.0-a10/include/IECoreMaya/CallbackId.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/CallbackId.h rename to cortex-9.0.0-a10/include/IECoreMaya/CallbackId.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ClassParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ClassParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ClassParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ClassParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ClassVectorParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ClassVectorParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ClassVectorParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ClassVectorParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ColorSplineParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ColorSplineParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ColorSplineParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ColorSplineParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/CompoundNumericParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/CompoundNumericParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/CompoundNumericParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/CompoundNumericParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/CompoundParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/CompoundParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/CompoundParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/CompoundParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/Convert.h b/cortex-9.0.0-a10/include/IECoreMaya/Convert.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/Convert.h rename to cortex-9.0.0-a10/include/IECoreMaya/Convert.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ConverterHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/ConverterHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ConverterHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/ConverterHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/CurveCombiner.h b/cortex-9.0.0-a10/include/IECoreMaya/CurveCombiner.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/CurveCombiner.h rename to cortex-9.0.0-a10/include/IECoreMaya/CurveCombiner.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/DateTimeParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/DateTimeParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/DateTimeParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/DateTimeParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/DelightProceduralCacheCommand.h b/cortex-9.0.0-a10/include/IECoreMaya/DelightProceduralCacheCommand.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/DelightProceduralCacheCommand.h rename to cortex-9.0.0-a10/include/IECoreMaya/DelightProceduralCacheCommand.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/DisplayStyle.h b/cortex-9.0.0-a10/include/IECoreMaya/DisplayStyle.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/DisplayStyle.h rename to cortex-9.0.0-a10/include/IECoreMaya/DisplayStyle.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/DrawableHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/DrawableHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/DrawableHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/DrawableHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/DrawableHolderUI.h b/cortex-9.0.0-a10/include/IECoreMaya/DrawableHolderUI.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/DrawableHolderUI.h rename to cortex-9.0.0-a10/include/IECoreMaya/DrawableHolderUI.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FloatSplineParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/FloatSplineParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FloatSplineParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/FloatSplineParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaArrayDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaArrayDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaArrayDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaArrayDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaCameraConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaCameraConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaCameraConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaCompoundNumericPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaCurveConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaCurveConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaCurveConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaCurveConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaDagNodeConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaDagNodeConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaDagNodeConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaDagNodeConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaDagNodeConverter.inl b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaDagNodeConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaDagNodeConverter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaDagNodeConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaFluidConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaFluidConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaFluidConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaFluidConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaGroupConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaGroupConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaGroupConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaGroupConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaImageConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaImageConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaImageConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaImageConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaLocatorConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaLocatorConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaLocatorConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaLocatorConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaMatrixDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaMatrixDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaMatrixDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaMatrixDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaMatrixVectorDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaMeshConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaMeshConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaMeshConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaMeshConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaNumericDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaNumericDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaNumericDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaNumericDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaNumericPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaNumericPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaNumericPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaNumericPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectConverter.inl b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectConverter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaObjectDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaObjectDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaParticleConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaParticleConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaParticleConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaParticleConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaPlugConverter.inl b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaPlugConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaPlugConverter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaPlugConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaPluginDataPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaPluginDataPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaPluginDataPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaPluginDataPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaProceduralHolderConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaProceduralHolderConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaProceduralHolderConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaProceduralHolderConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaShapeConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaShapeConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaShapeConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaShapeConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaShapeConverter.inl b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaShapeConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaShapeConverter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaShapeConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaSkinClusterConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaSkinClusterConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaSkinClusterConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaSkinClusterConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaStringPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaStringPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaStringPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaStringPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaTransformConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaTransformConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaTransformConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaTransformConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaTransformationMatrixConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaTransformationMatrixConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaTransformationMatrixConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaTransformationMatrixConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/FromMayaUnitPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/FromMayaUnitPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/FromMayaUnitPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/FromMayaUnitPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/GeometryCombiner.h b/cortex-9.0.0-a10/include/IECoreMaya/GeometryCombiner.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/GeometryCombiner.h rename to cortex-9.0.0-a10/include/IECoreMaya/GeometryCombiner.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/IECoreMaya.h b/cortex-9.0.0-a10/include/IECoreMaya/IECoreMaya.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/IECoreMaya.h rename to cortex-9.0.0-a10/include/IECoreMaya/IECoreMaya.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ImageFile.h b/cortex-9.0.0-a10/include/IECoreMaya/ImageFile.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ImageFile.h rename to cortex-9.0.0-a10/include/IECoreMaya/ImageFile.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ImagePlaneHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/ImagePlaneHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ImagePlaneHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/ImagePlaneHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ImageViewportPostProcess.h b/cortex-9.0.0-a10/include/IECoreMaya/ImageViewportPostProcess.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ImageViewportPostProcess.h rename to cortex-9.0.0-a10/include/IECoreMaya/ImageViewportPostProcess.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/LineSegmentParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/LineSegmentParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/LineSegmentParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/LineSegmentParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/LiveScene.h b/cortex-9.0.0-a10/include/IECoreMaya/LiveScene.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/LiveScene.h rename to cortex-9.0.0-a10/include/IECoreMaya/LiveScene.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MArrayIter.h b/cortex-9.0.0-a10/include/IECoreMaya/MArrayIter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MArrayIter.h rename to cortex-9.0.0-a10/include/IECoreMaya/MArrayIter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MArrayIter.inl b/cortex-9.0.0-a10/include/IECoreMaya/MArrayIter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MArrayIter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/MArrayIter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MArrayTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/MArrayTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MArrayTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/MArrayTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MDataHandleAccessor.h b/cortex-9.0.0-a10/include/IECoreMaya/MDataHandleAccessor.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MDataHandleAccessor.h rename to cortex-9.0.0-a10/include/IECoreMaya/MDataHandleAccessor.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MDataHandleAccessor.inl b/cortex-9.0.0-a10/include/IECoreMaya/MDataHandleAccessor.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MDataHandleAccessor.inl rename to cortex-9.0.0-a10/include/IECoreMaya/MDataHandleAccessor.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MFloatPointTree.h b/cortex-9.0.0-a10/include/IECoreMaya/MFloatPointTree.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MFloatPointTree.h rename to cortex-9.0.0-a10/include/IECoreMaya/MFloatPointTree.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MFloatVectorTree.h b/cortex-9.0.0-a10/include/IECoreMaya/MFloatVectorTree.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MFloatVectorTree.h rename to cortex-9.0.0-a10/include/IECoreMaya/MFloatVectorTree.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MFnDataTypeTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/MFnDataTypeTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MFnDataTypeTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/MFnDataTypeTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MImageAccessor.h b/cortex-9.0.0-a10/include/IECoreMaya/MImageAccessor.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MImageAccessor.h rename to cortex-9.0.0-a10/include/IECoreMaya/MImageAccessor.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MImageAccessor.inl b/cortex-9.0.0-a10/include/IECoreMaya/MImageAccessor.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MImageAccessor.inl rename to cortex-9.0.0-a10/include/IECoreMaya/MImageAccessor.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MPointTree.h b/cortex-9.0.0-a10/include/IECoreMaya/MPointTree.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MPointTree.h rename to cortex-9.0.0-a10/include/IECoreMaya/MPointTree.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MStringLess.h b/cortex-9.0.0-a10/include/IECoreMaya/MStringLess.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MStringLess.h rename to cortex-9.0.0-a10/include/IECoreMaya/MStringLess.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MVectorTree.h b/cortex-9.0.0-a10/include/IECoreMaya/MVectorTree.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MVectorTree.h rename to cortex-9.0.0-a10/include/IECoreMaya/MVectorTree.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MatrixTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/MatrixTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MatrixTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/MatrixTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MayaMeshBuilder.h b/cortex-9.0.0-a10/include/IECoreMaya/MayaMeshBuilder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MayaMeshBuilder.h rename to cortex-9.0.0-a10/include/IECoreMaya/MayaMeshBuilder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MayaMeshBuilder.inl b/cortex-9.0.0-a10/include/IECoreMaya/MayaMeshBuilder.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MayaMeshBuilder.inl rename to cortex-9.0.0-a10/include/IECoreMaya/MayaMeshBuilder.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MayaPythonUtil.h b/cortex-9.0.0-a10/include/IECoreMaya/MayaPythonUtil.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MayaPythonUtil.h rename to cortex-9.0.0-a10/include/IECoreMaya/MayaPythonUtil.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MayaTime.h b/cortex-9.0.0-a10/include/IECoreMaya/MayaTime.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MayaTime.h rename to cortex-9.0.0-a10/include/IECoreMaya/MayaTime.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MayaTypeIds.h b/cortex-9.0.0-a10/include/IECoreMaya/MayaTypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MayaTypeIds.h rename to cortex-9.0.0-a10/include/IECoreMaya/MayaTypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MeshParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/MeshParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MeshParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/MeshParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/MessageHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/MessageHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/MessageHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/MessageHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/NumericParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/NumericParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/NumericParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/NumericParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/NumericTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/NumericTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/NumericTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/NumericTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ObjectData.h b/cortex-9.0.0-a10/include/IECoreMaya/ObjectData.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ObjectData.h rename to cortex-9.0.0-a10/include/IECoreMaya/ObjectData.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ObjectMFnDataParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ObjectMFnDataParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ObjectMFnDataParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ObjectMFnDataParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ObjectParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ObjectParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ObjectParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ObjectParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ObjectVectorParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ObjectVectorParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ObjectVectorParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ObjectVectorParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/OpHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/OpHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/OpHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/OpHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterHandler.inl b/cortex-9.0.0-a10/include/IECoreMaya/ParameterHandler.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterHandler.inl rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterHandler.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterManipContainer.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterManipContainer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterManipContainer.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterManipContainer.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderInterface.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderInterface.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderInterface.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderManipContext.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderManipContext.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderManipContext.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderManipContext.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderManipContextCommand.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderManipContextCommand.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderManipContextCommand.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderManipContextCommand.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderModificationCmd.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderModificationCmd.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderModificationCmd.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderModificationCmd.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderSetValueCmd.h b/cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderSetValueCmd.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ParameterisedHolderSetValueCmd.h rename to cortex-9.0.0-a10/include/IECoreMaya/ParameterisedHolderSetValueCmd.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/PlaybackFrameList.h b/cortex-9.0.0-a10/include/IECoreMaya/PlaybackFrameList.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/PlaybackFrameList.h rename to cortex-9.0.0-a10/include/IECoreMaya/PlaybackFrameList.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/PostLoadCallback.h b/cortex-9.0.0-a10/include/IECoreMaya/PostLoadCallback.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/PostLoadCallback.h rename to cortex-9.0.0-a10/include/IECoreMaya/PostLoadCallback.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolder.h b/cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolder.h rename to cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h b/cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h rename to cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolderComponentBoundIterator.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolderUI.h b/cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolderUI.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ProceduralHolderUI.h rename to cortex-9.0.0-a10/include/IECoreMaya/ProceduralHolderUI.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/PythonCmd.h b/cortex-9.0.0-a10/include/IECoreMaya/PythonCmd.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/PythonCmd.h rename to cortex-9.0.0-a10/include/IECoreMaya/PythonCmd.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/SceneShape.h b/cortex-9.0.0-a10/include/IECoreMaya/SceneShape.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/SceneShape.h rename to cortex-9.0.0-a10/include/IECoreMaya/SceneShape.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/SceneShapeInterface.h b/cortex-9.0.0-a10/include/IECoreMaya/SceneShapeInterface.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/SceneShapeInterface.h rename to cortex-9.0.0-a10/include/IECoreMaya/SceneShapeInterface.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h b/cortex-9.0.0-a10/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h rename to cortex-9.0.0-a10/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/SceneShapeUI.h b/cortex-9.0.0-a10/include/IECoreMaya/SceneShapeUI.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/SceneShapeUI.h rename to cortex-9.0.0-a10/include/IECoreMaya/SceneShapeUI.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/StatusException.h b/cortex-9.0.0-a10/include/IECoreMaya/StatusException.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/StatusException.h rename to cortex-9.0.0-a10/include/IECoreMaya/StatusException.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/StringParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/StringParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/StringParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/StringParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/StringVectorParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/StringVectorParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/StringVectorParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/StringVectorParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/SystemExitCmd.h b/cortex-9.0.0-a10/include/IECoreMaya/SystemExitCmd.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/SystemExitCmd.h rename to cortex-9.0.0-a10/include/IECoreMaya/SystemExitCmd.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaArrayDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaArrayDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaArrayDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaArrayDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaCameraConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaCameraConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaCameraConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaCurveConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaCurveConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaCurveConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaCurveConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaGroupConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaGroupConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaGroupConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaGroupConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaImageConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaImageConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaImageConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaImageConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaLocatorConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaLocatorConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaLocatorConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaLocatorConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaMatrixDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaMatrixDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaMatrixDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaMatrixDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaMatrixVectorDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaMeshConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaMeshConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaMeshConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaMeshConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaNumericDataConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaNumericDataConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaNumericDataConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaNumericDataConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaObjectConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaObjectConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaObjectConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaObjectConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaObjectConverter.inl b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaObjectConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaObjectConverter.inl rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaObjectConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaParticleConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaParticleConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaParticleConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaParticleConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaPlugConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaPlugConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaPlugConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaPlugConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ToMayaSkinClusterConverter.h b/cortex-9.0.0-a10/include/IECoreMaya/ToMayaSkinClusterConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ToMayaSkinClusterConverter.h rename to cortex-9.0.0-a10/include/IECoreMaya/ToMayaSkinClusterConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/TransformationMatrixManipulator.h b/cortex-9.0.0-a10/include/IECoreMaya/TransformationMatrixManipulator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/TransformationMatrixManipulator.h rename to cortex-9.0.0-a10/include/IECoreMaya/TransformationMatrixManipulator.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/TransformationMatrixParameterHandler.h b/cortex-9.0.0-a10/include/IECoreMaya/TransformationMatrixParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/TransformationMatrixParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreMaya/TransformationMatrixParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/TransientParameterisedHolderNode.h b/cortex-9.0.0-a10/include/IECoreMaya/TransientParameterisedHolderNode.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/TransientParameterisedHolderNode.h rename to cortex-9.0.0-a10/include/IECoreMaya/TransientParameterisedHolderNode.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/TypeIds.h b/cortex-9.0.0-a10/include/IECoreMaya/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreMaya/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/TypeTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/TypeTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/TypeTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/TypeTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/UnitTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/UnitTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/UnitTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/UnitTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/V3Manipulator.h b/cortex-9.0.0-a10/include/IECoreMaya/V3Manipulator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/V3Manipulator.h rename to cortex-9.0.0-a10/include/IECoreMaya/V3Manipulator.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/VectorTraits.h b/cortex-9.0.0-a10/include/IECoreMaya/VectorTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/VectorTraits.h rename to cortex-9.0.0-a10/include/IECoreMaya/VectorTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ViewportPostProcess.h b/cortex-9.0.0-a10/include/IECoreMaya/ViewportPostProcess.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ViewportPostProcess.h rename to cortex-9.0.0-a10/include/IECoreMaya/ViewportPostProcess.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/ViewportPostProcessCallback.h b/cortex-9.0.0-a10/include/IECoreMaya/ViewportPostProcessCallback.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/ViewportPostProcessCallback.h rename to cortex-9.0.0-a10/include/IECoreMaya/ViewportPostProcessCallback.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/CallbackIdBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/CallbackIdBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/CallbackIdBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/CallbackIdBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FnProceduralHolderBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FnProceduralHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FnProceduralHolderBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FnProceduralHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FnSceneShapeBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FnSceneShapeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FnSceneShapeBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FnSceneShapeBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCameraConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaCurveConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaGroupConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaImageConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaLocatorConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaMeshConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaNumericPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaParticleConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaProceduralHolderConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaShapeConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaTransformConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ImageViewportPostProcessBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/LiveSceneBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/LiveSceneBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/LiveSceneBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/LiveSceneBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MDagPathFromPython.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MDagPathFromPython.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MDagPathFromPython.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MDagPathFromPython.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MObjectFromPython.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MObjectFromPython.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MObjectFromPython.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MObjectFromPython.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MPlugFromPython.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MPlugFromPython.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MPlugFromPython.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MPlugFromPython.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MStringFromPython.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MStringFromPython.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MStringFromPython.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MStringFromPython.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaMeshBuilderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaPythonUtilBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaPythonUtilBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaPythonUtilBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaPythonUtilBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaTypeIdBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaTypeIdBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MayaTypeIdBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MayaTypeIdBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/MessageHandlerBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/MessageHandlerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/MessageHandlerBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/MessageHandlerBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/PlaybackFrameListBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/PlaybackFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/PlaybackFrameListBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/PlaybackFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/StandaloneBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/StandaloneBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/StandaloneBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/StandaloneBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaCameraConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaCurveConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaGroupConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaImageConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaLocatorConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaMeshConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaObjectConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaParticleConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaPlugConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/TypeIdBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/TypeIdBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/TypeIdBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/TypeIdBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ViewportPostProcessBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ViewportPostProcessBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ViewportPostProcessBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ViewportPostProcessBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h b/cortex-9.0.0-a10/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h rename to cortex-9.0.0-a10/include/IECoreMaya/bindings/ViewportPostProcessCallbackBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/BoolParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/BoolParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/BoolParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/BoolParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Box3ParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/Box3ParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Box3ParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/Box3ParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ClassParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/ClassParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ClassParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/ClassParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ClassVectorParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/ClassVectorParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ClassVectorParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/ClassVectorParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Color3fParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/Color3fParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Color3fParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/Color3fParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/CompoundParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/CompoundParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/CompoundParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/CompoundParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Convert.h b/cortex-9.0.0-a10/include/IECoreNuke/Convert.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Convert.h rename to cortex-9.0.0-a10/include/IECoreNuke/Convert.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/CurveLookup.h b/cortex-9.0.0-a10/include/IECoreNuke/CurveLookup.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/CurveLookup.h rename to cortex-9.0.0-a10/include/IECoreNuke/CurveLookup.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/CurveLookup.inl b/cortex-9.0.0-a10/include/IECoreNuke/CurveLookup.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/CurveLookup.inl rename to cortex-9.0.0-a10/include/IECoreNuke/CurveLookup.inl diff --git a/cortex-9.0.0-a6/include/IECoreNuke/DeepImageReader.h b/cortex-9.0.0-a10/include/IECoreNuke/DeepImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/DeepImageReader.h rename to cortex-9.0.0-a10/include/IECoreNuke/DeepImageReader.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/DisplayIop.h b/cortex-9.0.0-a10/include/IECoreNuke/DisplayIop.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/DisplayIop.h rename to cortex-9.0.0-a10/include/IECoreNuke/DisplayIop.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/DrawableHolder.h b/cortex-9.0.0-a10/include/IECoreNuke/DrawableHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/DrawableHolder.h rename to cortex-9.0.0-a10/include/IECoreNuke/DrawableHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/FloatParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/FloatParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/FloatParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/FloatParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/FromNukeCameraConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/FromNukeCameraConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/FromNukeCameraConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/FromNukeCameraConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/FromNukeConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/FromNukeConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/FromNukeConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/FromNukeConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/FromNukePointsConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/FromNukePointsConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/FromNukePointsConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/FromNukePointsConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/FromNukeTileConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/FromNukeTileConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/FromNukeTileConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/FromNukeTileConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Hash.h b/cortex-9.0.0-a10/include/IECoreNuke/Hash.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Hash.h rename to cortex-9.0.0-a10/include/IECoreNuke/Hash.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Hash.inl b/cortex-9.0.0-a10/include/IECoreNuke/Hash.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Hash.inl rename to cortex-9.0.0-a10/include/IECoreNuke/Hash.inl diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ImagePrimitiveParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/ImagePrimitiveParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ImagePrimitiveParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/ImagePrimitiveParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/IntParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/IntParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/IntParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/IntParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/LensDistort.h b/cortex-9.0.0-a10/include/IECoreNuke/LensDistort.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/LensDistort.h rename to cortex-9.0.0-a10/include/IECoreNuke/LensDistort.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/LineSegment3ParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/LineSegment3ParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/LineSegment3ParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/LineSegment3ParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/MeshFromNuke.h b/cortex-9.0.0-a10/include/IECoreNuke/MeshFromNuke.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/MeshFromNuke.h rename to cortex-9.0.0-a10/include/IECoreNuke/MeshFromNuke.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/MeshPrimitiveParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/MeshPrimitiveParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/MeshPrimitiveParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/MeshPrimitiveParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/MeshToNukeGeometryConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/MeshToNukeGeometryConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/MeshToNukeGeometryConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/MeshToNukeGeometryConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ObjectHolder.h b/cortex-9.0.0-a10/include/IECoreNuke/ObjectHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ObjectHolder.h rename to cortex-9.0.0-a10/include/IECoreNuke/ObjectHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ObjectKnob.h b/cortex-9.0.0-a10/include/IECoreNuke/ObjectKnob.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ObjectKnob.h rename to cortex-9.0.0-a10/include/IECoreNuke/ObjectKnob.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ObjectVectorParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/ObjectVectorParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ObjectVectorParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/ObjectVectorParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/OpHolder.h b/cortex-9.0.0-a10/include/IECoreNuke/OpHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/OpHolder.h rename to cortex-9.0.0-a10/include/IECoreNuke/OpHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/ParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/ParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ParameterisedHolder.h b/cortex-9.0.0-a10/include/IECoreNuke/ParameterisedHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ParameterisedHolder.h rename to cortex-9.0.0-a10/include/IECoreNuke/ParameterisedHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/PathParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/PathParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/PathParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/PathParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/PresetsOnlyParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/PresetsOnlyParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/PresetsOnlyParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/PresetsOnlyParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ProceduralHolder.h b/cortex-9.0.0-a10/include/IECoreNuke/ProceduralHolder.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ProceduralHolder.h rename to cortex-9.0.0-a10/include/IECoreNuke/ProceduralHolder.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/SceneCacheReader.h b/cortex-9.0.0-a10/include/IECoreNuke/SceneCacheReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/SceneCacheReader.h rename to cortex-9.0.0-a10/include/IECoreNuke/SceneCacheReader.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/StringParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/StringParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/StringParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/StringParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ToNukeConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/ToNukeConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ToNukeConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/ToNukeConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ToNukeGeometryConverter.h b/cortex-9.0.0-a10/include/IECoreNuke/ToNukeGeometryConverter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ToNukeGeometryConverter.h rename to cortex-9.0.0-a10/include/IECoreNuke/ToNukeGeometryConverter.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/ToNukeGeometryConverter.inl b/cortex-9.0.0-a10/include/IECoreNuke/ToNukeGeometryConverter.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/ToNukeGeometryConverter.inl rename to cortex-9.0.0-a10/include/IECoreNuke/ToNukeGeometryConverter.inl diff --git a/cortex-9.0.0-a6/include/IECoreNuke/TypeIds.h b/cortex-9.0.0-a10/include/IECoreNuke/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreNuke/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/VecParameterHandler.h b/cortex-9.0.0-a10/include/IECoreNuke/VecParameterHandler.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/VecParameterHandler.h rename to cortex-9.0.0-a10/include/IECoreNuke/VecParameterHandler.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/Warp.h b/cortex-9.0.0-a10/include/IECoreNuke/Warp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/Warp.h rename to cortex-9.0.0-a10/include/IECoreNuke/Warp.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/bindings/FnOpHolderBinding.h b/cortex-9.0.0-a10/include/IECoreNuke/bindings/FnOpHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/bindings/FnOpHolderBinding.h rename to cortex-9.0.0-a10/include/IECoreNuke/bindings/FnOpHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h b/cortex-9.0.0-a10/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h rename to cortex-9.0.0-a10/include/IECoreNuke/bindings/FnParameterisedHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreNuke/bindings/ObjectKnobBinding.h b/cortex-9.0.0-a10/include/IECoreNuke/bindings/ObjectKnobBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreNuke/bindings/ObjectKnobBinding.h rename to cortex-9.0.0-a10/include/IECoreNuke/bindings/ObjectKnobBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/AddSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/AlexaLogcToLinearOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/AlexaLogcToLinearOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/AlexaLogcToLinearOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/AlexaLogcToLinearOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/AngleConversionBinding.h b/cortex-9.0.0-a10/include/IECorePython/AngleConversionBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/AngleConversionBinding.h rename to cortex-9.0.0-a10/include/IECorePython/AngleConversionBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/AttributeCacheBinding.h b/cortex-9.0.0-a10/include/IECorePython/AttributeCacheBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/AttributeCacheBinding.h rename to cortex-9.0.0-a10/include/IECorePython/AttributeCacheBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/AttributeStateBinding.h b/cortex-9.0.0-a10/include/IECorePython/AttributeStateBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/AttributeStateBinding.h rename to cortex-9.0.0-a10/include/IECorePython/AttributeStateBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/BezierAlgoBinding.h b/cortex-9.0.0-a10/include/IECorePython/BezierAlgoBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/BezierAlgoBinding.h rename to cortex-9.0.0-a10/include/IECorePython/BezierAlgoBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/BinaryFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/BinaryFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/BinaryFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/BinaryFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/BlindDataHolderBinding.h b/cortex-9.0.0-a10/include/IECorePython/BlindDataHolderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/BlindDataHolderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/BlindDataHolderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/BoundedKDTreeBinding.h b/cortex-9.0.0-a10/include/IECorePython/BoundedKDTreeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/BoundedKDTreeBinding.h rename to cortex-9.0.0-a10/include/IECorePython/BoundedKDTreeBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CINImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/CINImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CINImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CINImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CINImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/CINImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CINImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CINImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CachedReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/CachedReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CachedReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CachedReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CamelCaseBinding.h b/cortex-9.0.0-a10/include/IECorePython/CamelCaseBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CamelCaseBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CamelCaseBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CameraBinding.h b/cortex-9.0.0-a10/include/IECorePython/CameraBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CameraBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CameraBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CameraControllerBinding.h b/cortex-9.0.0-a10/include/IECorePython/CameraControllerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CameraControllerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CameraControllerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CapturingRendererBinding.h b/cortex-9.0.0-a10/include/IECorePython/CapturingRendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CapturingRendererBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CapturingRendererBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ChannelOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ChannelOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ChannelOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ChannelOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CineonToLinearOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CineonToLinearOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CineonToLinearOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CineonToLinearOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ClampOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ClampOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ClampOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ClampOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ClientDisplayDriverBinding.h b/cortex-9.0.0-a10/include/IECorePython/ClientDisplayDriverBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ClientDisplayDriverBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ClientDisplayDriverBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ColorSpaceTransformOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ColorSpaceTransformOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ColorSpaceTransformOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ColorSpaceTransformOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ColorTransformOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ColorTransformOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ColorTransformOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ColorTransformOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CompoundDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/CompoundDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CompoundDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CompoundDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CompoundFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/CompoundFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CompoundFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CompoundFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CompoundObjectBinding.h b/cortex-9.0.0-a10/include/IECorePython/CompoundObjectBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CompoundObjectBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CompoundObjectBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CompoundParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/CompoundParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CompoundParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CompoundParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CompressSmoothSkinningDataOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CompressSmoothSkinningDataOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CompressSmoothSkinningDataOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CompressSmoothSkinningDataOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ContrastSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ConverterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ConverterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CoordinateSystemBinding.h b/cortex-9.0.0-a10/include/IECorePython/CoordinateSystemBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CoordinateSystemBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CoordinateSystemBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CubeColorLookupBinding.h b/cortex-9.0.0-a10/include/IECorePython/CubeColorLookupBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CubeColorLookupBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CubeColorLookupBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CubeColorLookupDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/CubeColorLookupDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CubeColorLookupDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CubeColorLookupDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CubeColorLookupParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/CubeColorLookupParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CubeColorLookupParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CubeColorLookupParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CubeColorTransformOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CubeColorTransformOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CubeColorTransformOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CubeColorTransformOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CubicBasisBinding.h b/cortex-9.0.0-a10/include/IECorePython/CubicBasisBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CubicBasisBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CubicBasisBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurveExtrudeOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurveExtrudeOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurveExtrudeOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurveExtrudeOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurveLineariserBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurveLineariserBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurveLineariserBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurveLineariserBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurveTangentsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurveTangentsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurveTangentsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurveTangentsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurveTracerBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurveTracerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurveTracerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurveTracerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurvesMergeOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurvesMergeOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurvesMergeOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurvesMergeOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurvesPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurvesPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurvesPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurvesPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/CurvesPrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DPXImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/DPXImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DPXImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DPXImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DPXImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/DPXImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DPXImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DPXImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DataBinding.h b/cortex-9.0.0-a10/include/IECorePython/DataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DataCastOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/DataCastOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DataCastOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DataCastOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DataConvertOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/DataConvertOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DataConvertOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DataConvertOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DataInterleaveOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/DataInterleaveOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DataInterleaveOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DataInterleaveOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DataPromoteOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/DataPromoteOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DataPromoteOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DataPromoteOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DateTimeDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/DateTimeDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DateTimeDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DateTimeDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DateTimeParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/DateTimeParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DateTimeParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DateTimeParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DecompressSmoothSkinningDataOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DeepImageConverterBinding.h b/cortex-9.0.0-a10/include/IECorePython/DeepImageConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DeepImageConverterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DeepImageConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DeepImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/DeepImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DeepImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DeepImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DeepImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/DeepImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DeepImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DeepImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DeepPixelBinding.h b/cortex-9.0.0-a10/include/IECorePython/DeepPixelBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DeepPixelBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DeepPixelBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DirNameParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/DirNameParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DirNameParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DirNameParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DiskPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/DiskPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DiskPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DiskPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DisplayBinding.h b/cortex-9.0.0-a10/include/IECorePython/DisplayBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DisplayBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DisplayBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DisplayDriverBinding.h b/cortex-9.0.0-a10/include/IECorePython/DisplayDriverBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DisplayDriverBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DisplayDriverBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/DisplayDriverServerBinding.h b/cortex-9.0.0-a10/include/IECorePython/DisplayDriverServerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/DisplayDriverServerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/DisplayDriverServerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EXRDeepImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/EXRDeepImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EXRDeepImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EXRDeepImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EXRDeepImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/EXRDeepImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EXRDeepImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EXRDeepImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EXRImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/EXRImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EXRImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EXRImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EXRImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/EXRImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EXRImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EXRImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EmptyFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/EmptyFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EmptyFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EmptyFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EnvMapSHProjectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/EnvMapSHProjectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EnvMapSHProjectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EnvMapSHProjectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/EnvMapSamplerBinding.h b/cortex-9.0.0-a10/include/IECorePython/EnvMapSamplerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/EnvMapSamplerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/EnvMapSamplerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ExceptionBinding.h b/cortex-9.0.0-a10/include/IECorePython/ExceptionBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ExceptionBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ExceptionBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ExclusionFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/ExclusionFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ExclusionFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ExclusionFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ExternalProceduralBinding.h b/cortex-9.0.0-a10/include/IECorePython/ExternalProceduralBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ExternalProceduralBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ExternalProceduralBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FaceAreaOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/FaceAreaOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FaceAreaOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FaceAreaOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FaceVaryingPromotionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/FaceVaryingPromotionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FaceVaryingPromotionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FaceVaryingPromotionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FileNameParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/FileNameParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FileNameParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FileNameParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FileSequenceBinding.h b/cortex-9.0.0-a10/include/IECorePython/FileSequenceBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FileSequenceBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FileSequenceBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FileSequenceFunctionsBinding.h b/cortex-9.0.0-a10/include/IECorePython/FileSequenceFunctionsBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FileSequenceFunctionsBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FileSequenceFunctionsBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FileSequenceParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/FileSequenceParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FileSequenceParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FileSequenceParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FileSequenceVectorParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/FileSequenceVectorParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FileSequenceVectorParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FileSequenceVectorParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FontBinding.h b/cortex-9.0.0-a10/include/IECorePython/FontBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FontBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FontBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/FrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FrameListParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/FrameListParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FrameListParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FrameListParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FrameRangeBinding.h b/cortex-9.0.0-a10/include/IECorePython/FrameRangeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FrameRangeBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FrameRangeBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/FromCoreConverterBinding.h b/cortex-9.0.0-a10/include/IECorePython/FromCoreConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/FromCoreConverterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/FromCoreConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/GeometricTypedDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/GeometricTypedDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/GeometricTypedDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/GeometricTypedDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/GeometricTypedDataBinding.inl b/cortex-9.0.0-a10/include/IECorePython/GeometricTypedDataBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/GeometricTypedDataBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/GeometricTypedDataBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/GradeBinding.h b/cortex-9.0.0-a10/include/IECorePython/GradeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/GradeBinding.h rename to cortex-9.0.0-a10/include/IECorePython/GradeBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/GroupBinding.h b/cortex-9.0.0-a10/include/IECorePython/GroupBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/GroupBinding.h rename to cortex-9.0.0-a10/include/IECorePython/GroupBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HalfBinding.h b/cortex-9.0.0-a10/include/IECorePython/HalfBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HalfBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HalfBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HdrMergeOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/HdrMergeOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HdrMergeOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HdrMergeOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HeaderGeneratorBinding.h b/cortex-9.0.0-a10/include/IECorePython/HeaderGeneratorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HeaderGeneratorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HeaderGeneratorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HenyeyGreensteinBinding.h b/cortex-9.0.0-a10/include/IECorePython/HenyeyGreensteinBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HenyeyGreensteinBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HenyeyGreensteinBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HexConversionBinding.h b/cortex-9.0.0-a10/include/IECorePython/HexConversionBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HexConversionBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HexConversionBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/HitMissTransformBinding.h b/cortex-9.0.0-a10/include/IECorePython/HitMissTransformBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/HitMissTransformBinding.h rename to cortex-9.0.0-a10/include/IECorePython/HitMissTransformBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/IECoreBinding.h b/cortex-9.0.0-a10/include/IECorePython/IECoreBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/IECoreBinding.h rename to cortex-9.0.0-a10/include/IECorePython/IECoreBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageCompositeOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageCompositeOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageCompositeOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageCompositeOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageConvolveOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageConvolveOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageConvolveOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageConvolveOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageCropOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageCropOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageCropOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageCropOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageDiffOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageDiffOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageDiffOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageDiffOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageDisplayDriverBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageDisplayDriverBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageDisplayDriverBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageDisplayDriverBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImagePremultiplyOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImagePremultiplyOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImagePremultiplyOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImagePremultiplyOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImagePrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImagePrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImagePrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImagePrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImagePrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImagePrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImagePrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImagePrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageThinnerBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageThinnerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageThinnerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageThinnerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageUnpremultiplyOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageUnpremultiplyOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageUnpremultiplyOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageUnpremultiplyOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathBoxBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathBoxBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathBoxBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathBoxBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathBoxVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathBoxVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathBoxVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathBoxVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathColorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathColorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathColorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathColorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathColorVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathColorVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathColorVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathColorVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathEulerBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathEulerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathEulerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathEulerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathMatrixBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathMatrixBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathMatrixBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathMatrixBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathMatrixVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathMatrixVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathMatrixVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathMatrixVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathPlaneBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathPlaneBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathPlaneBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathPlaneBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathQuatBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathQuatBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathQuatBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathQuatBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathQuatVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathQuatVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathQuatVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathQuatVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathRandomBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathRandomBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathRandomBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathRandomBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathRootsBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathRootsBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathRootsBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathRootsBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathVecBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathVecBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathVecBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathVecBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImathVecVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImathVecVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImathVecVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImathVecVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImfBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImfBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImfBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImfBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ImfTimeCodeBinding.h b/cortex-9.0.0-a10/include/IECorePython/ImfTimeCodeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ImfTimeCodeBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ImfTimeCodeBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/IndexedIOBinding.h b/cortex-9.0.0-a10/include/IECorePython/IndexedIOBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/IndexedIOBinding.h rename to cortex-9.0.0-a10/include/IECorePython/IndexedIOBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/InternedStringBinding.h b/cortex-9.0.0-a10/include/IECorePython/InternedStringBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/InternedStringBinding.h rename to cortex-9.0.0-a10/include/IECorePython/InternedStringBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/InterpolatedCacheBinding.h b/cortex-9.0.0-a10/include/IECorePython/InterpolatedCacheBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/InterpolatedCacheBinding.h rename to cortex-9.0.0-a10/include/IECorePython/InterpolatedCacheBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h b/cortex-9.0.0-a10/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h rename to cortex-9.0.0-a10/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/JPEGImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/JPEGImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/JPEGImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/JPEGImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/JPEGImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/JPEGImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/JPEGImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/JPEGImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/KDTreeBinding.h b/cortex-9.0.0-a10/include/IECorePython/KDTreeBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/KDTreeBinding.h rename to cortex-9.0.0-a10/include/IECorePython/KDTreeBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LRUCacheBinding.h b/cortex-9.0.0-a10/include/IECorePython/LRUCacheBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LRUCacheBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LRUCacheBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LensDistortOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LensDistortOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LensDistortOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LensDistortOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LensModelBinding.h b/cortex-9.0.0-a10/include/IECorePython/LensModelBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LensModelBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LensModelBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LevenbergMarquardtBinding.h b/cortex-9.0.0-a10/include/IECorePython/LevenbergMarquardtBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LevenbergMarquardtBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LevenbergMarquardtBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LightBinding.h b/cortex-9.0.0-a10/include/IECorePython/LightBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LightBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LightBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LimitSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LineSegmentBinding.h b/cortex-9.0.0-a10/include/IECorePython/LineSegmentBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LineSegmentBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LineSegmentBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinearToAlexaLogcOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinearToAlexaLogcOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinearToAlexaLogcOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinearToAlexaLogcOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinearToCineonOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinearToCineonOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinearToCineonOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinearToCineonOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinearToPanalogOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinearToPanalogOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinearToPanalogOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinearToPanalogOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinearToRec709OpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinearToRec709OpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinearToRec709OpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinearToRec709OpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinearToSRGBOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinearToSRGBOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinearToSRGBOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinearToSRGBOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LinkedSceneBinding.h b/cortex-9.0.0-a10/include/IECorePython/LinkedSceneBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LinkedSceneBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LinkedSceneBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LookupBinding.h b/cortex-9.0.0-a10/include/IECorePython/LookupBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LookupBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LookupBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/LuminanceOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/LuminanceOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/LuminanceOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/LuminanceOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MPlayDisplayDriverBinding.h b/cortex-9.0.0-a10/include/IECorePython/MPlayDisplayDriverBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MPlayDisplayDriverBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MPlayDisplayDriverBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MappedRandomPointDistributionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MappedRandomPointDistributionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MappedRandomPointDistributionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MappedRandomPointDistributionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MarschnerLookupTableOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MarschnerLookupTableOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MarschnerLookupTableOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MarschnerLookupTableOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MarschnerParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/MarschnerParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MarschnerParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MarschnerParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MathBinding.h b/cortex-9.0.0-a10/include/IECorePython/MathBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MathBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MathBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MatrixMotionTransformBinding.h b/cortex-9.0.0-a10/include/IECorePython/MatrixMotionTransformBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MatrixMotionTransformBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MatrixMotionTransformBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MatrixMultiplyOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MatrixMultiplyOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MatrixMultiplyOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MatrixMultiplyOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MatrixTransformBinding.h b/cortex-9.0.0-a10/include/IECorePython/MatrixTransformBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MatrixTransformBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MatrixTransformBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MedianCutSamplerBinding.h b/cortex-9.0.0-a10/include/IECorePython/MedianCutSamplerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MedianCutSamplerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MedianCutSamplerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshDistortionsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshDistortionsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshDistortionsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshDistortionsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshFaceFilterOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshFaceFilterOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshFaceFilterOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshFaceFilterOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshMergeOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshMergeOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshMergeOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshMergeOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshNormalsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshNormalsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshNormalsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshNormalsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveBuilderBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveBuilderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveBuilderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveBuilderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshPrimitiveShrinkWrapOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshTangentsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshTangentsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshTangentsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshTangentsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MeshVertexReorderOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MeshVertexReorderOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MeshVertexReorderOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MeshVertexReorderOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MessageHandlerBinding.h b/cortex-9.0.0-a10/include/IECorePython/MessageHandlerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MessageHandlerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MessageHandlerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MixSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ModifyOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ModifyOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ModifyOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ModifyOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MotionPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/MotionPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MotionPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MotionPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/MurmurHashBinding.h b/cortex-9.0.0-a10/include/IECorePython/MurmurHashBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/MurmurHashBinding.h rename to cortex-9.0.0-a10/include/IECorePython/MurmurHashBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/NParticleReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/NParticleReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/NParticleReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/NParticleReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/NURBSPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/NURBSPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/NURBSPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/NURBSPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/NullObjectBinding.h b/cortex-9.0.0-a10/include/IECorePython/NullObjectBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/NullObjectBinding.h rename to cortex-9.0.0-a10/include/IECorePython/NullObjectBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/NumericParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/NumericParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/NumericParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/NumericParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/OBJReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/OBJReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/OBJReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/OBJReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectInterpolatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectInterpolatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectInterpolatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectInterpolatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectPoolBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectPoolBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectPoolBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectPoolBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectVectorBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectVectorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectVectorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectVectorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ObjectWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ObjectWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ObjectWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ObjectWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/OpBinding.h b/cortex-9.0.0-a10/include/IECorePython/OpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/OpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/OpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/OptionsBinding.h b/cortex-9.0.0-a10/include/IECorePython/OptionsBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/OptionsBinding.h rename to cortex-9.0.0-a10/include/IECorePython/OptionsBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/OversamplesCalculatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/OversamplesCalculatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/OversamplesCalculatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/OversamplesCalculatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PDCParticleReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/PDCParticleReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PDCParticleReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PDCParticleReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PDCParticleWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/PDCParticleWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PDCParticleWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PDCParticleWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PNGImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/PNGImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PNGImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PNGImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PanalogToLinearOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PanalogToLinearOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PanalogToLinearOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PanalogToLinearOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ParameterBinding.inl b/cortex-9.0.0-a10/include/IECorePython/ParameterBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParameterBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/ParameterBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/ParameterisedBinding.h b/cortex-9.0.0-a10/include/IECorePython/ParameterisedBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParameterisedBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ParameterisedBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ParameterisedProceduralBinding.h b/cortex-9.0.0-a10/include/IECorePython/ParameterisedProceduralBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParameterisedProceduralBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ParameterisedProceduralBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ParticleReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/ParticleReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParticleReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ParticleReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ParticleWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ParticleWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ParticleWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ParticleWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PatchMeshPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/PatchMeshPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PatchMeshPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PatchMeshPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PathParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/PathParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PathParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PathParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PathVectorParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/PathVectorParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PathVectorParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PathVectorParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PerlinNoiseBinding.h b/cortex-9.0.0-a10/include/IECorePython/PerlinNoiseBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PerlinNoiseBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PerlinNoiseBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointBoundsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointBoundsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointBoundsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointBoundsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointDensitiesOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointDensitiesOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointDensitiesOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointDensitiesOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointDistributionBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointDistributionBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointDistributionBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointDistributionBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointDistributionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointDistributionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointDistributionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointDistributionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointNormalsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointNormalsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointNormalsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointNormalsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointRepulsionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointRepulsionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointRepulsionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointRepulsionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointSmoothSkinningOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointSmoothSkinningOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointSmoothSkinningOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointSmoothSkinningOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointVelocityDisplaceOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointVelocityDisplaceOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointVelocityDisplaceOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointVelocityDisplaceOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointerFromSWIG.h b/cortex-9.0.0-a10/include/IECorePython/PointerFromSWIG.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointerFromSWIG.h rename to cortex-9.0.0-a10/include/IECorePython/PointerFromSWIG.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointerFromSWIG.inl b/cortex-9.0.0-a10/include/IECorePython/PointerFromSWIG.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointerFromSWIG.inl rename to cortex-9.0.0-a10/include/IECorePython/PointerFromSWIG.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/PointsMotionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointsMotionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointsMotionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointsMotionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointsPrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointsPrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointsPrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointsPrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PointsPrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/PointsPrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PointsPrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PointsPrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PolygonAlgoBinding.h b/cortex-9.0.0-a10/include/IECorePython/PolygonAlgoBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PolygonAlgoBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PolygonAlgoBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PreWorldRenderableBinding.h b/cortex-9.0.0-a10/include/IECorePython/PreWorldRenderableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PreWorldRenderableBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PreWorldRenderableBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/PrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/PrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PrimitiveOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/PrimitiveOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PrimitiveOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PrimitiveOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/PrimitiveVariableBinding.h b/cortex-9.0.0-a10/include/IECorePython/PrimitiveVariableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/PrimitiveVariableBinding.h rename to cortex-9.0.0-a10/include/IECorePython/PrimitiveVariableBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RadixSortBinding.h b/cortex-9.0.0-a10/include/IECorePython/RadixSortBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RadixSortBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RadixSortBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RandomRotationOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/RandomRotationOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RandomRotationOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RandomRotationOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/ReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/Rec709ToLinearOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/Rec709ToLinearOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/Rec709ToLinearOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/Rec709ToLinearOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RefCountedBinding.h b/cortex-9.0.0-a10/include/IECorePython/RefCountedBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RefCountedBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RefCountedBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RefCountedBinding.inl b/cortex-9.0.0-a10/include/IECorePython/RefCountedBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RefCountedBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/RefCountedBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RenderableBinding.h b/cortex-9.0.0-a10/include/IECorePython/RenderableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RenderableBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RenderableBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RendererBinding.h b/cortex-9.0.0-a10/include/IECorePython/RendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RendererBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RendererBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ReorderedFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/ReorderedFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ReorderedFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ReorderedFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ReversedFrameListBinding.h b/cortex-9.0.0-a10/include/IECorePython/ReversedFrameListBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ReversedFrameListBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ReversedFrameListBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RunTimeTypedBinding.h b/cortex-9.0.0-a10/include/IECorePython/RunTimeTypedBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RunTimeTypedBinding.h rename to cortex-9.0.0-a10/include/IECorePython/RunTimeTypedBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/RunTimeTypedBinding.inl b/cortex-9.0.0-a10/include/IECorePython/RunTimeTypedBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/RunTimeTypedBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/RunTimeTypedBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/SGIImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/SGIImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SGIImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SGIImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SRGBToLinearOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/SRGBToLinearOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SRGBToLinearOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SRGBToLinearOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SampledSceneInterfaceBinding.h b/cortex-9.0.0-a10/include/IECorePython/SampledSceneInterfaceBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SampledSceneInterfaceBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SampledSceneInterfaceBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SceneCacheBinding.h b/cortex-9.0.0-a10/include/IECorePython/SceneCacheBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SceneCacheBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SceneCacheBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SceneInterfaceBinding.h b/cortex-9.0.0-a10/include/IECorePython/SceneInterfaceBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SceneInterfaceBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SceneInterfaceBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ScopedGILLock.h b/cortex-9.0.0-a10/include/IECorePython/ScopedGILLock.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ScopedGILLock.h rename to cortex-9.0.0-a10/include/IECorePython/ScopedGILLock.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ScopedGILRelease.h b/cortex-9.0.0-a10/include/IECorePython/ScopedGILRelease.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ScopedGILRelease.h rename to cortex-9.0.0-a10/include/IECorePython/ScopedGILRelease.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SearchPathBinding.h b/cortex-9.0.0-a10/include/IECorePython/SearchPathBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SearchPathBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SearchPathBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ShaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/ShaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ShaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ShaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SharedSceneInterfacesBinding.h b/cortex-9.0.0-a10/include/IECorePython/SharedSceneInterfacesBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SharedSceneInterfacesBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SharedSceneInterfacesBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SimpleTypedDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/SimpleTypedDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SimpleTypedDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SimpleTypedDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SimpleTypedDataBinding.inl b/cortex-9.0.0-a10/include/IECorePython/SimpleTypedDataBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SimpleTypedDataBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/SimpleTypedDataBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/SimpleTypedParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/SimpleTypedParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SimpleTypedParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SimpleTypedParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SmoothSkinningDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/SmoothSkinningDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SmoothSkinningDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SmoothSkinningDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SmoothSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SpherePrimitiveBinding.h b/cortex-9.0.0-a10/include/IECorePython/SpherePrimitiveBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SpherePrimitiveBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SpherePrimitiveBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SpherePrimitiveEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/SpherePrimitiveEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SpherePrimitiveEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SpherePrimitiveEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SplineBinding.h b/cortex-9.0.0-a10/include/IECorePython/SplineBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SplineBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SplineBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SplineDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/SplineDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SplineDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SplineDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SplineParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/SplineParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SplineParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SplineParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SplineToImageBinding.h b/cortex-9.0.0-a10/include/IECorePython/SplineToImageBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SplineToImageBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SplineToImageBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/StandardRadialLensModelBinding.h b/cortex-9.0.0-a10/include/IECorePython/StandardRadialLensModelBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/StandardRadialLensModelBinding.h rename to cortex-9.0.0-a10/include/IECorePython/StandardRadialLensModelBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/StateRenderableBinding.h b/cortex-9.0.0-a10/include/IECorePython/StateRenderableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/StateRenderableBinding.h rename to cortex-9.0.0-a10/include/IECorePython/StateRenderableBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/SummedAreaOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/SummedAreaOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/SummedAreaOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/SummedAreaOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TGAImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/TGAImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TGAImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TGAImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TGAImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TGAImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TGAImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TGAImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TIFFImageReaderBinding.h b/cortex-9.0.0-a10/include/IECorePython/TIFFImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TIFFImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TIFFImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TIFFImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TIFFImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TIFFImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TIFFImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimeCodeDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimeCodeDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimeCodeDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimeCodeDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimeCodeParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimeCodeParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimeCodeParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimeCodeParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimeDurationDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimeDurationDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimeDurationDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimeDurationDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimeDurationParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimeDurationParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimeDurationParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimeDurationParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimePeriodBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimePeriodBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimePeriodBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimePeriodBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimePeriodDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimePeriodDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimePeriodDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimePeriodDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimePeriodParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimePeriodParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimePeriodParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimePeriodParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TimerBinding.h b/cortex-9.0.0-a10/include/IECorePython/TimerBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TimerBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TimerBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ToCoreConverterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ToCoreConverterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ToCoreConverterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ToCoreConverterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TransferSmoothSkinningWeightsOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TransformBinding.h b/cortex-9.0.0-a10/include/IECorePython/TransformBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TransformBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TransformBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TransformOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/TransformOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TransformOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TransformOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TransformationMatrixBinding.h b/cortex-9.0.0-a10/include/IECorePython/TransformationMatrixBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TransformationMatrixBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TransformationMatrixBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TransformationMatrixDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/TransformationMatrixDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TransformationMatrixDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TransformationMatrixDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TriangleAlgoBinding.h b/cortex-9.0.0-a10/include/IECorePython/TriangleAlgoBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TriangleAlgoBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TriangleAlgoBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TriangulateOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/TriangulateOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TriangulateOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TriangulateOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TriangulatorBinding.h b/cortex-9.0.0-a10/include/IECorePython/TriangulatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TriangulatorBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TriangulatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TurbulenceBinding.h b/cortex-9.0.0-a10/include/IECorePython/TurbulenceBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TurbulenceBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TurbulenceBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TypeIdBinding.h b/cortex-9.0.0-a10/include/IECorePython/TypeIdBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypeIdBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TypeIdBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedObjectParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TypedObjectParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedObjectParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TypedObjectParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedObjectParameterBinding.inl b/cortex-9.0.0-a10/include/IECorePython/TypedObjectParameterBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedObjectParameterBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/TypedObjectParameterBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TypedParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TypedParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedParameterBinding.inl b/cortex-9.0.0-a10/include/IECorePython/TypedParameterBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedParameterBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/TypedParameterBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedPrimitiveOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/TypedPrimitiveOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedPrimitiveOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TypedPrimitiveOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/TypedPrimitiveParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/TypedPrimitiveParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/TypedPrimitiveParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/TypedPrimitiveParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/UVDistortOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/UVDistortOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/UVDistortOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/UVDistortOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/UnicodeToStringBinding.h b/cortex-9.0.0-a10/include/IECorePython/UnicodeToStringBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/UnicodeToStringBinding.h rename to cortex-9.0.0-a10/include/IECorePython/UnicodeToStringBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/UniformRandomPointDistributionOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/UniformRandomPointDistributionOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/UniformRandomPointDistributionOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/UniformRandomPointDistributionOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/ValidatedStringParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/ValidatedStringParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/ValidatedStringParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/ValidatedStringParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/VectorDataFilterOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/VectorDataFilterOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/VectorDataFilterOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/VectorDataFilterOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/VectorTypedDataBinding.h b/cortex-9.0.0-a10/include/IECorePython/VectorTypedDataBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/VectorTypedDataBinding.h rename to cortex-9.0.0-a10/include/IECorePython/VectorTypedDataBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/VectorTypedDataBinding.inl b/cortex-9.0.0-a10/include/IECorePython/VectorTypedDataBinding.inl similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/VectorTypedDataBinding.inl rename to cortex-9.0.0-a10/include/IECorePython/VectorTypedDataBinding.inl diff --git a/cortex-9.0.0-a6/include/IECorePython/VectorTypedParameterBinding.h b/cortex-9.0.0-a10/include/IECorePython/VectorTypedParameterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/VectorTypedParameterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/VectorTypedParameterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/VisibleRenderableBinding.h b/cortex-9.0.0-a10/include/IECorePython/VisibleRenderableBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/VisibleRenderableBinding.h rename to cortex-9.0.0-a10/include/IECorePython/VisibleRenderableBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/WarpOpBinding.h b/cortex-9.0.0-a10/include/IECorePython/WarpOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/WarpOpBinding.h rename to cortex-9.0.0-a10/include/IECorePython/WarpOpBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/Wrapper.h b/cortex-9.0.0-a10/include/IECorePython/Wrapper.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/Wrapper.h rename to cortex-9.0.0-a10/include/IECorePython/Wrapper.h diff --git a/cortex-9.0.0-a6/include/IECorePython/WrapperGarbageCollector.h b/cortex-9.0.0-a10/include/IECorePython/WrapperGarbageCollector.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/WrapperGarbageCollector.h rename to cortex-9.0.0-a10/include/IECorePython/WrapperGarbageCollector.h diff --git a/cortex-9.0.0-a6/include/IECorePython/WriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/WriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/WriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/WriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECorePython/YUVImageWriterBinding.h b/cortex-9.0.0-a10/include/IECorePython/YUVImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECorePython/YUVImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECorePython/YUVImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/Convert.h b/cortex-9.0.0-a10/include/IECoreRI/Convert.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/Convert.h rename to cortex-9.0.0-a10/include/IECoreRI/Convert.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/DTEXDeepImageReader.h b/cortex-9.0.0-a10/include/IECoreRI/DTEXDeepImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/DTEXDeepImageReader.h rename to cortex-9.0.0-a10/include/IECoreRI/DTEXDeepImageReader.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/DTEXDeepImageWriter.h b/cortex-9.0.0-a10/include/IECoreRI/DTEXDeepImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/DTEXDeepImageWriter.h rename to cortex-9.0.0-a10/include/IECoreRI/DTEXDeepImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/Dspy.h b/cortex-9.0.0-a10/include/IECoreRI/Dspy.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/Dspy.h rename to cortex-9.0.0-a10/include/IECoreRI/Dspy.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/GXEvaluator.h b/cortex-9.0.0-a10/include/IECoreRI/GXEvaluator.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/GXEvaluator.h rename to cortex-9.0.0-a10/include/IECoreRI/GXEvaluator.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/IECoreRI.h b/cortex-9.0.0-a10/include/IECoreRI/IECoreRI.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/IECoreRI.h rename to cortex-9.0.0-a10/include/IECoreRI/IECoreRI.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/PTCParticleIO.h b/cortex-9.0.0-a10/include/IECoreRI/PTCParticleIO.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/PTCParticleIO.h rename to cortex-9.0.0-a10/include/IECoreRI/PTCParticleIO.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/PTCParticleReader.h b/cortex-9.0.0-a10/include/IECoreRI/PTCParticleReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/PTCParticleReader.h rename to cortex-9.0.0-a10/include/IECoreRI/PTCParticleReader.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/PTCParticleWriter.h b/cortex-9.0.0-a10/include/IECoreRI/PTCParticleWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/PTCParticleWriter.h rename to cortex-9.0.0-a10/include/IECoreRI/PTCParticleWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/ParameterList.h b/cortex-9.0.0-a10/include/IECoreRI/ParameterList.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/ParameterList.h rename to cortex-9.0.0-a10/include/IECoreRI/ParameterList.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/PrimitiveVariableList.h b/cortex-9.0.0-a10/include/IECoreRI/PrimitiveVariableList.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/PrimitiveVariableList.h rename to cortex-9.0.0-a10/include/IECoreRI/PrimitiveVariableList.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/RIBWriter.h b/cortex-9.0.0-a10/include/IECoreRI/RIBWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/RIBWriter.h rename to cortex-9.0.0-a10/include/IECoreRI/RIBWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/Renderer.h b/cortex-9.0.0-a10/include/IECoreRI/Renderer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/Renderer.h rename to cortex-9.0.0-a10/include/IECoreRI/Renderer.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SHWDeepImageReader.h b/cortex-9.0.0-a10/include/IECoreRI/SHWDeepImageReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SHWDeepImageReader.h rename to cortex-9.0.0-a10/include/IECoreRI/SHWDeepImageReader.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SHWDeepImageWriter.h b/cortex-9.0.0-a10/include/IECoreRI/SHWDeepImageWriter.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SHWDeepImageWriter.h rename to cortex-9.0.0-a10/include/IECoreRI/SHWDeepImageWriter.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SLOReader.h b/cortex-9.0.0-a10/include/IECoreRI/SLOReader.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SLOReader.h rename to cortex-9.0.0-a10/include/IECoreRI/SLOReader.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SXExecutor.h b/cortex-9.0.0-a10/include/IECoreRI/SXExecutor.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SXExecutor.h rename to cortex-9.0.0-a10/include/IECoreRI/SXExecutor.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SXRenderer.h b/cortex-9.0.0-a10/include/IECoreRI/SXRenderer.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SXRenderer.h rename to cortex-9.0.0-a10/include/IECoreRI/SXRenderer.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/SXTypeTraits.h b/cortex-9.0.0-a10/include/IECoreRI/SXTypeTraits.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/SXTypeTraits.h rename to cortex-9.0.0-a10/include/IECoreRI/SXTypeTraits.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/ScopedContext.h b/cortex-9.0.0-a10/include/IECoreRI/ScopedContext.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/ScopedContext.h rename to cortex-9.0.0-a10/include/IECoreRI/ScopedContext.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/TypeIds.h b/cortex-9.0.0-a10/include/IECoreRI/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreRI/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/DTEXDeepImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/DTEXDeepImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/GXEvaluatorBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/GXEvaluatorBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/GXEvaluatorBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/GXEvaluatorBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/PTCParticleReaderBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/PTCParticleReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/PTCParticleReaderBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/PTCParticleReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/PTCParticleWriterBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/PTCParticleWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/PTCParticleWriterBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/PTCParticleWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/RIBWriterBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/RIBWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/RIBWriterBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/RIBWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/RendererBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/RendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/RendererBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/RendererBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/SHWDeepImageReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/SHWDeepImageWriterBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/SLOReaderBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/SLOReaderBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/SLOReaderBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/SLOReaderBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/bindings/SXRendererBinding.h b/cortex-9.0.0-a10/include/IECoreRI/bindings/SXRendererBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/bindings/SXRendererBinding.h rename to cortex-9.0.0-a10/include/IECoreRI/bindings/SXRendererBinding.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/private/RendererImplementation.h b/cortex-9.0.0-a10/include/IECoreRI/private/RendererImplementation.h similarity index 99% rename from cortex-9.0.0-a6/include/IECoreRI/private/RendererImplementation.h rename to cortex-9.0.0-a10/include/IECoreRI/private/RendererImplementation.h index 1d1cda8b64..14b978f194 100644 --- a/cortex-9.0.0-a6/include/IECoreRI/private/RendererImplementation.h +++ b/cortex-9.0.0-a10/include/IECoreRI/private/RendererImplementation.h @@ -195,6 +195,7 @@ class RendererImplementation : public IECore::Renderer size_t m_numDisplays; std::string m_lastCamera; bool m_inWorld; + bool m_inEdit; struct AttributeState { diff --git a/cortex-9.0.0-a6/include/IECoreRI/private/SXRendererImplementation.h b/cortex-9.0.0-a10/include/IECoreRI/private/SXRendererImplementation.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/private/SXRendererImplementation.h rename to cortex-9.0.0-a10/include/IECoreRI/private/SXRendererImplementation.h diff --git a/cortex-9.0.0-a6/include/IECoreRI/private/TransformStack.h b/cortex-9.0.0-a10/include/IECoreRI/private/TransformStack.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreRI/private/TransformStack.h rename to cortex-9.0.0-a10/include/IECoreRI/private/TransformStack.h diff --git a/cortex-9.0.0-a6/include/IECoreTruelight/IECoreTruelight.h b/cortex-9.0.0-a10/include/IECoreTruelight/IECoreTruelight.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreTruelight/IECoreTruelight.h rename to cortex-9.0.0-a10/include/IECoreTruelight/IECoreTruelight.h diff --git a/cortex-9.0.0-a6/include/IECoreTruelight/TruelightColorTransformOp.h b/cortex-9.0.0-a10/include/IECoreTruelight/TruelightColorTransformOp.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreTruelight/TruelightColorTransformOp.h rename to cortex-9.0.0-a10/include/IECoreTruelight/TruelightColorTransformOp.h diff --git a/cortex-9.0.0-a6/include/IECoreTruelight/TypeIds.h b/cortex-9.0.0-a10/include/IECoreTruelight/TypeIds.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreTruelight/TypeIds.h rename to cortex-9.0.0-a10/include/IECoreTruelight/TypeIds.h diff --git a/cortex-9.0.0-a6/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h b/cortex-9.0.0-a10/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h similarity index 100% rename from cortex-9.0.0-a6/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h rename to cortex-9.0.0-a10/include/IECoreTruelight/bindings/TruelightColorTransformOpBinding.h diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/IECoreMaya.mel b/cortex-9.0.0-a10/mel/IECoreMaya/IECoreMaya.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/IECoreMaya.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/IECoreMaya.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieAttr.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieAttr.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieAttr.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieAttr.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieAttributeEditorControl.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieAttributeEditorControl.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieAttributeEditorControl.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieAttributeEditorControl.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieConverterHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieConverterHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieConverterHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieConverterHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieCurveCombinerUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieCurveCombinerUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieCurveCombinerUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieCurveCombinerUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieDLUserGeoTypes.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieDLUserGeoTypes.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieDLUserGeoTypes.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieDLUserGeoTypes.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieDrawableHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieDrawableHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieDrawableHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieDrawableHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieGeometryCombinerUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieGeometryCombinerUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieGeometryCombinerUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieGeometryCombinerUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieImagePlaneHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieImagePlaneHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieImagePlaneHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieImagePlaneHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieNode.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieNode.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieNode.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieNode.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieOpHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieOpHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieOpHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieOpHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/iePanel.mel b/cortex-9.0.0-a10/mel/IECoreMaya/iePanel.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/iePanel.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/iePanel.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieParameterPanel.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieParameterPanel.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieParameterPanel.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieParameterPanel.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolder.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolder.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolder.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolder.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolderSetUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolderSetUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolderSetUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolderSetUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieParameterisedHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieParameterisedHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieProceduralHolder.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieProceduralHolder.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieProceduralHolder.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieProceduralHolder.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieProceduralHolderUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieProceduralHolderUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieProceduralHolderUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieProceduralHolderUI.mel diff --git a/cortex-9.0.0-a6/mel/IECoreMaya/ieSceneShapeUI.mel b/cortex-9.0.0-a10/mel/IECoreMaya/ieSceneShapeUI.mel similarity index 100% rename from cortex-9.0.0-a6/mel/IECoreMaya/ieSceneShapeUI.mel rename to cortex-9.0.0-a10/mel/IECoreMaya/ieSceneShapeUI.mel diff --git a/cortex-9.0.0-a6/menus/IECoreHoudini/cortex.shelf b/cortex-9.0.0-a10/menus/IECoreHoudini/cortex.shelf similarity index 100% rename from cortex-9.0.0-a6/menus/IECoreHoudini/cortex.shelf rename to cortex-9.0.0-a10/menus/IECoreHoudini/cortex.shelf diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/INDEX__SECTION diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sections.list b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sections.list similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sections.list rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sections.list diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.contents diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPdummydefs diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/.OPfallbacks diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.net diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1.order diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.chn diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/ri_dynamicload1.spareparmdef diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/cortexRmanInject1/suboutput1.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.dir/node_type diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Contents.gz diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/CreateScript diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/DialogScript diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/ExtraFileOptions diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Help diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Sections.list diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/Tools.shelf diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/TypePropertiesOptions diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Shop_1cortexRmanInject/applications-graphics.svg diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.contents diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.inp diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.net diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1.order diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/DUMMY_GEO.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/INPUT_GEO.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/OUT.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.chn diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.def diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.init diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/cortexWriter1/cache_geometry_to_disk.parm diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.dir/node_type diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Contents.gz diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/CreateScript diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/DialogScript diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/EditableNodes diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/ExtraFileOptions diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Help diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Sections.list diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/Tools.shelf diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/TypePropertiesOptions diff --git a/cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg b/cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg similarity index 100% rename from cortex-9.0.0-a6/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg rename to cortex-9.0.0-a10/otls/IECoreHoudini/ieCoreHoudini/Sop_1cortexWriter/media-floppy.svg diff --git a/cortex-9.0.0-a6/python/IECore/AttributeBlock.py b/cortex-9.0.0-a10/python/IECore/AttributeBlock.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/AttributeBlock.py rename to cortex-9.0.0-a10/python/IECore/AttributeBlock.py diff --git a/cortex-9.0.0-a6/python/IECore/BasicPreset.py b/cortex-9.0.0-a10/python/IECore/BasicPreset.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/BasicPreset.py rename to cortex-9.0.0-a10/python/IECore/BasicPreset.py diff --git a/cortex-9.0.0-a6/python/IECore/CapturingMessageHandler.py b/cortex-9.0.0-a10/python/IECore/CapturingMessageHandler.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/CapturingMessageHandler.py rename to cortex-9.0.0-a10/python/IECore/CapturingMessageHandler.py diff --git a/cortex-9.0.0-a6/python/IECore/CheckFileDependenciesOp.py b/cortex-9.0.0-a10/python/IECore/CheckFileDependenciesOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/CheckFileDependenciesOp.py rename to cortex-9.0.0-a10/python/IECore/CheckFileDependenciesOp.py diff --git a/cortex-9.0.0-a6/python/IECore/CheckImagesOp.py b/cortex-9.0.0-a10/python/IECore/CheckImagesOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/CheckImagesOp.py rename to cortex-9.0.0-a10/python/IECore/CheckImagesOp.py diff --git a/cortex-9.0.0-a6/python/IECore/ClassLoader.py b/cortex-9.0.0-a10/python/IECore/ClassLoader.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ClassLoader.py rename to cortex-9.0.0-a10/python/IECore/ClassLoader.py diff --git a/cortex-9.0.0-a6/python/IECore/ClassLsOp.py b/cortex-9.0.0-a10/python/IECore/ClassLsOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ClassLsOp.py rename to cortex-9.0.0-a10/python/IECore/ClassLsOp.py diff --git a/cortex-9.0.0-a6/python/IECore/ClassParameter.py b/cortex-9.0.0-a10/python/IECore/ClassParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ClassParameter.py rename to cortex-9.0.0-a10/python/IECore/ClassParameter.py diff --git a/cortex-9.0.0-a6/python/IECore/ClassVectorParameter.py b/cortex-9.0.0-a10/python/IECore/ClassVectorParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ClassVectorParameter.py rename to cortex-9.0.0-a10/python/IECore/ClassVectorParameter.py diff --git a/cortex-9.0.0-a6/python/IECore/CompoundStream.py b/cortex-9.0.0-a10/python/IECore/CompoundStream.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/CompoundStream.py rename to cortex-9.0.0-a10/python/IECore/CompoundStream.py diff --git a/cortex-9.0.0-a6/python/IECore/CompoundVectorParameter.py b/cortex-9.0.0-a10/python/IECore/CompoundVectorParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/CompoundVectorParameter.py rename to cortex-9.0.0-a10/python/IECore/CompoundVectorParameter.py diff --git a/cortex-9.0.0-a6/python/IECore/ConfigLoader.py b/cortex-9.0.0-a10/python/IECore/ConfigLoader.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ConfigLoader.py rename to cortex-9.0.0-a10/python/IECore/ConfigLoader.py diff --git a/cortex-9.0.0-a6/python/IECore/DataTraits.py b/cortex-9.0.0-a10/python/IECore/DataTraits.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/DataTraits.py rename to cortex-9.0.0-a10/python/IECore/DataTraits.py diff --git a/cortex-9.0.0-a6/python/IECore/DateTimeParameterParser.py b/cortex-9.0.0-a10/python/IECore/DateTimeParameterParser.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/DateTimeParameterParser.py rename to cortex-9.0.0-a10/python/IECore/DateTimeParameterParser.py diff --git a/cortex-9.0.0-a6/python/IECore/EditBlock.py b/cortex-9.0.0-a10/python/IECore/EditBlock.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/EditBlock.py rename to cortex-9.0.0-a10/python/IECore/EditBlock.py diff --git a/cortex-9.0.0-a6/python/IECore/Enum.py b/cortex-9.0.0-a10/python/IECore/Enum.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/Enum.py rename to cortex-9.0.0-a10/python/IECore/Enum.py diff --git a/cortex-9.0.0-a6/python/IECore/FileDependenciesOp.py b/cortex-9.0.0-a10/python/IECore/FileDependenciesOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FileDependenciesOp.py rename to cortex-9.0.0-a10/python/IECore/FileDependenciesOp.py diff --git a/cortex-9.0.0-a6/python/IECore/FileExaminer.py b/cortex-9.0.0-a10/python/IECore/FileExaminer.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FileExaminer.py rename to cortex-9.0.0-a10/python/IECore/FileExaminer.py diff --git a/cortex-9.0.0-a6/python/IECore/FileSequenceAnalyzerOp.py b/cortex-9.0.0-a10/python/IECore/FileSequenceAnalyzerOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FileSequenceAnalyzerOp.py rename to cortex-9.0.0-a10/python/IECore/FileSequenceAnalyzerOp.py diff --git a/cortex-9.0.0-a6/python/IECore/FileSequenceFunctions.py b/cortex-9.0.0-a10/python/IECore/FileSequenceFunctions.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FileSequenceFunctions.py rename to cortex-9.0.0-a10/python/IECore/FileSequenceFunctions.py diff --git a/cortex-9.0.0-a6/python/IECore/FileSequenceGraphOp.py b/cortex-9.0.0-a10/python/IECore/FileSequenceGraphOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FileSequenceGraphOp.py rename to cortex-9.0.0-a10/python/IECore/FileSequenceGraphOp.py diff --git a/cortex-9.0.0-a6/python/IECore/FormattedParameterHelp.py b/cortex-9.0.0-a10/python/IECore/FormattedParameterHelp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/FormattedParameterHelp.py rename to cortex-9.0.0-a10/python/IECore/FormattedParameterHelp.py diff --git a/cortex-9.0.0-a6/python/IECore/Formatter.py b/cortex-9.0.0-a10/python/IECore/Formatter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/Formatter.py rename to cortex-9.0.0-a10/python/IECore/Formatter.py diff --git a/cortex-9.0.0-a6/python/IECore/IDXReader.py b/cortex-9.0.0-a10/python/IECore/IDXReader.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/IDXReader.py rename to cortex-9.0.0-a10/python/IECore/IDXReader.py diff --git a/cortex-9.0.0-a6/python/IECore/IgnoredExceptions.py b/cortex-9.0.0-a10/python/IECore/IgnoredExceptions.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/IgnoredExceptions.py rename to cortex-9.0.0-a10/python/IECore/IgnoredExceptions.py diff --git a/cortex-9.0.0-a6/python/IECore/ImageSequenceCompositeOp.py b/cortex-9.0.0-a10/python/IECore/ImageSequenceCompositeOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ImageSequenceCompositeOp.py rename to cortex-9.0.0-a10/python/IECore/ImageSequenceCompositeOp.py diff --git a/cortex-9.0.0-a6/python/IECore/LayeredDict.py b/cortex-9.0.0-a10/python/IECore/LayeredDict.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/LayeredDict.py rename to cortex-9.0.0-a10/python/IECore/LayeredDict.py diff --git a/cortex-9.0.0-a6/python/IECore/Log.py b/cortex-9.0.0-a10/python/IECore/Log.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/Log.py rename to cortex-9.0.0-a10/python/IECore/Log.py diff --git a/cortex-9.0.0-a6/python/IECore/LsHeaderOp.py b/cortex-9.0.0-a10/python/IECore/LsHeaderOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/LsHeaderOp.py rename to cortex-9.0.0-a10/python/IECore/LsHeaderOp.py diff --git a/cortex-9.0.0-a6/python/IECore/MenuDefinition.py b/cortex-9.0.0-a10/python/IECore/MenuDefinition.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/MenuDefinition.py rename to cortex-9.0.0-a10/python/IECore/MenuDefinition.py diff --git a/cortex-9.0.0-a6/python/IECore/MenuItemDefinition.py b/cortex-9.0.0-a10/python/IECore/MenuItemDefinition.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/MenuItemDefinition.py rename to cortex-9.0.0-a10/python/IECore/MenuItemDefinition.py diff --git a/cortex-9.0.0-a6/python/IECore/MessageHandlerOverwriting.py b/cortex-9.0.0-a10/python/IECore/MessageHandlerOverwriting.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/MessageHandlerOverwriting.py rename to cortex-9.0.0-a10/python/IECore/MessageHandlerOverwriting.py diff --git a/cortex-9.0.0-a6/python/IECore/MotionBlock.py b/cortex-9.0.0-a10/python/IECore/MotionBlock.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/MotionBlock.py rename to cortex-9.0.0-a10/python/IECore/MotionBlock.py diff --git a/cortex-9.0.0-a6/python/IECore/NukeFileExaminer.py b/cortex-9.0.0-a10/python/IECore/NukeFileExaminer.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/NukeFileExaminer.py rename to cortex-9.0.0-a10/python/IECore/NukeFileExaminer.py diff --git a/cortex-9.0.0-a6/python/IECore/ObjectOverwriting.py b/cortex-9.0.0-a10/python/IECore/ObjectOverwriting.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ObjectOverwriting.py rename to cortex-9.0.0-a10/python/IECore/ObjectOverwriting.py diff --git a/cortex-9.0.0-a6/python/IECore/OpOverwriting.py b/cortex-9.0.0-a10/python/IECore/OpOverwriting.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/OpOverwriting.py rename to cortex-9.0.0-a10/python/IECore/OpOverwriting.py diff --git a/cortex-9.0.0-a6/python/IECore/OptionalCompoundParameter.py b/cortex-9.0.0-a10/python/IECore/OptionalCompoundParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/OptionalCompoundParameter.py rename to cortex-9.0.0-a10/python/IECore/OptionalCompoundParameter.py diff --git a/cortex-9.0.0-a6/python/IECore/ParameterAlgo.py b/cortex-9.0.0-a10/python/IECore/ParameterAlgo.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ParameterAlgo.py rename to cortex-9.0.0-a10/python/IECore/ParameterAlgo.py diff --git a/cortex-9.0.0-a6/python/IECore/ParameterOverwriting.py b/cortex-9.0.0-a10/python/IECore/ParameterOverwriting.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ParameterOverwriting.py rename to cortex-9.0.0-a10/python/IECore/ParameterOverwriting.py diff --git a/cortex-9.0.0-a6/python/IECore/ParameterParser.py b/cortex-9.0.0-a10/python/IECore/ParameterParser.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ParameterParser.py rename to cortex-9.0.0-a10/python/IECore/ParameterParser.py diff --git a/cortex-9.0.0-a6/python/IECore/ParameterisedOverwriting.py b/cortex-9.0.0-a10/python/IECore/ParameterisedOverwriting.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ParameterisedOverwriting.py rename to cortex-9.0.0-a10/python/IECore/ParameterisedOverwriting.py diff --git a/cortex-9.0.0-a6/python/IECore/PointsExpressionOp.py b/cortex-9.0.0-a10/python/IECore/PointsExpressionOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/PointsExpressionOp.py rename to cortex-9.0.0-a10/python/IECore/PointsExpressionOp.py diff --git a/cortex-9.0.0-a6/python/IECore/Preset.py b/cortex-9.0.0-a10/python/IECore/Preset.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/Preset.py rename to cortex-9.0.0-a10/python/IECore/Preset.py diff --git a/cortex-9.0.0-a6/python/IECore/RIBFileExaminer.py b/cortex-9.0.0-a10/python/IECore/RIBFileExaminer.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/RIBFileExaminer.py rename to cortex-9.0.0-a10/python/IECore/RIBFileExaminer.py diff --git a/cortex-9.0.0-a6/python/IECore/ReadProcedural.py b/cortex-9.0.0-a10/python/IECore/ReadProcedural.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/ReadProcedural.py rename to cortex-9.0.0-a10/python/IECore/ReadProcedural.py diff --git a/cortex-9.0.0-a6/python/IECore/RelativePreset.py b/cortex-9.0.0-a10/python/IECore/RelativePreset.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/RelativePreset.py rename to cortex-9.0.0-a10/python/IECore/RelativePreset.py diff --git a/cortex-9.0.0-a6/python/IECore/RemovePrimitiveVariables.py b/cortex-9.0.0-a10/python/IECore/RemovePrimitiveVariables.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/RemovePrimitiveVariables.py rename to cortex-9.0.0-a10/python/IECore/RemovePrimitiveVariables.py diff --git a/cortex-9.0.0-a6/python/IECore/RenamePrimitiveVariables.py b/cortex-9.0.0-a10/python/IECore/RenamePrimitiveVariables.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/RenamePrimitiveVariables.py rename to cortex-9.0.0-a10/python/IECore/RenamePrimitiveVariables.py diff --git a/cortex-9.0.0-a6/python/IECore/SWAReader.py b/cortex-9.0.0-a10/python/IECore/SWAReader.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SWAReader.py rename to cortex-9.0.0-a10/python/IECore/SWAReader.py diff --git a/cortex-9.0.0-a6/python/IECore/SearchReplaceOp.py b/cortex-9.0.0-a10/python/IECore/SearchReplaceOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SearchReplaceOp.py rename to cortex-9.0.0-a10/python/IECore/SearchReplaceOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceCatOp.py b/cortex-9.0.0-a10/python/IECore/SequenceCatOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceCatOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceCatOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceConvertOp.py b/cortex-9.0.0-a10/python/IECore/SequenceConvertOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceConvertOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceConvertOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceCpOp.py b/cortex-9.0.0-a10/python/IECore/SequenceCpOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceCpOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceCpOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceLsOp.py b/cortex-9.0.0-a10/python/IECore/SequenceLsOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceLsOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceLsOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceMergeOp.py b/cortex-9.0.0-a10/python/IECore/SequenceMergeOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceMergeOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceMergeOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceMvOp.py b/cortex-9.0.0-a10/python/IECore/SequenceMvOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceMvOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceMvOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceRenumberOp.py b/cortex-9.0.0-a10/python/IECore/SequenceRenumberOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceRenumberOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceRenumberOp.py diff --git a/cortex-9.0.0-a6/python/IECore/SequenceRmOp.py b/cortex-9.0.0-a10/python/IECore/SequenceRmOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SequenceRmOp.py rename to cortex-9.0.0-a10/python/IECore/SequenceRmOp.py diff --git a/cortex-9.0.0-a6/python/IECore/StringUtil.py b/cortex-9.0.0-a10/python/IECore/StringUtil.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/StringUtil.py rename to cortex-9.0.0-a10/python/IECore/StringUtil.py diff --git a/cortex-9.0.0-a6/python/IECore/Struct.py b/cortex-9.0.0-a10/python/IECore/Struct.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/Struct.py rename to cortex-9.0.0-a10/python/IECore/Struct.py diff --git a/cortex-9.0.0-a6/python/IECore/SubstitutedDict.py b/cortex-9.0.0-a10/python/IECore/SubstitutedDict.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/SubstitutedDict.py rename to cortex-9.0.0-a10/python/IECore/SubstitutedDict.py diff --git a/cortex-9.0.0-a6/python/IECore/TransformBlock.py b/cortex-9.0.0-a10/python/IECore/TransformBlock.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/TransformBlock.py rename to cortex-9.0.0-a10/python/IECore/TransformBlock.py diff --git a/cortex-9.0.0-a6/python/IECore/VisualiserProcedural.py b/cortex-9.0.0-a10/python/IECore/VisualiserProcedural.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/VisualiserProcedural.py rename to cortex-9.0.0-a10/python/IECore/VisualiserProcedural.py diff --git a/cortex-9.0.0-a6/python/IECore/WorldBlock.py b/cortex-9.0.0-a10/python/IECore/WorldBlock.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/WorldBlock.py rename to cortex-9.0.0-a10/python/IECore/WorldBlock.py diff --git a/cortex-9.0.0-a6/python/IECore/WrappedTextFormatter.py b/cortex-9.0.0-a10/python/IECore/WrappedTextFormatter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/WrappedTextFormatter.py rename to cortex-9.0.0-a10/python/IECore/WrappedTextFormatter.py diff --git a/cortex-9.0.0-a6/python/IECore/__init__.py b/cortex-9.0.0-a10/python/IECore/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/__init__.py rename to cortex-9.0.0-a10/python/IECore/__init__.py diff --git a/cortex-9.0.0-a6/python/IECore/curry.py b/cortex-9.0.0-a10/python/IECore/curry.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/curry.py rename to cortex-9.0.0-a10/python/IECore/curry.py diff --git a/cortex-9.0.0-a6/python/IECore/registerObject.py b/cortex-9.0.0-a10/python/IECore/registerObject.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/registerObject.py rename to cortex-9.0.0-a10/python/IECore/registerObject.py diff --git a/cortex-9.0.0-a6/python/IECore/registerRunTimeTyped.py b/cortex-9.0.0-a10/python/IECore/registerRunTimeTyped.py similarity index 100% rename from cortex-9.0.0-a6/python/IECore/registerRunTimeTyped.py rename to cortex-9.0.0-a10/python/IECore/registerRunTimeTyped.py diff --git a/cortex-9.0.0-a6/python/IECoreGL/State.py b/cortex-9.0.0-a10/python/IECoreGL/State.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreGL/State.py rename to cortex-9.0.0-a10/python/IECoreGL/State.py diff --git a/cortex-9.0.0-a6/python/IECoreGL/__init__.py b/cortex-9.0.0-a10/python/IECoreGL/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreGL/__init__.py rename to cortex-9.0.0-a10/python/IECoreGL/__init__.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/ActiveTake.py b/cortex-9.0.0-a10/python/IECoreHoudini/ActiveTake.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/ActiveTake.py rename to cortex-9.0.0-a10/python/IECoreHoudini/ActiveTake.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/FnOpHolder.py b/cortex-9.0.0-a10/python/IECoreHoudini/FnOpHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/FnOpHolder.py rename to cortex-9.0.0-a10/python/IECoreHoudini/FnOpHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/FnParameterisedHolder.py b/cortex-9.0.0-a10/python/IECoreHoudini/FnParameterisedHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/FnParameterisedHolder.py rename to cortex-9.0.0-a10/python/IECoreHoudini/FnParameterisedHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/FnProceduralHolder.py b/cortex-9.0.0-a10/python/IECoreHoudini/FnProceduralHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/FnProceduralHolder.py rename to cortex-9.0.0-a10/python/IECoreHoudini/FnProceduralHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/ParmTemplates.py b/cortex-9.0.0-a10/python/IECoreHoudini/ParmTemplates.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/ParmTemplates.py rename to cortex-9.0.0-a10/python/IECoreHoudini/ParmTemplates.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/TemporaryParameterValues.py b/cortex-9.0.0-a10/python/IECoreHoudini/TemporaryParameterValues.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/TemporaryParameterValues.py rename to cortex-9.0.0-a10/python/IECoreHoudini/TemporaryParameterValues.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/TestCase.py b/cortex-9.0.0-a10/python/IECoreHoudini/TestCase.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/TestCase.py rename to cortex-9.0.0-a10/python/IECoreHoudini/TestCase.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/TestProgram.py b/cortex-9.0.0-a10/python/IECoreHoudini/TestProgram.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/TestProgram.py rename to cortex-9.0.0-a10/python/IECoreHoudini/TestProgram.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/UpdateMode.py b/cortex-9.0.0-a10/python/IECoreHoudini/UpdateMode.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/UpdateMode.py rename to cortex-9.0.0-a10/python/IECoreHoudini/UpdateMode.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/Utils.py b/cortex-9.0.0-a10/python/IECoreHoudini/Utils.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/Utils.py rename to cortex-9.0.0-a10/python/IECoreHoudini/Utils.py diff --git a/cortex-9.0.0-a6/python/IECoreHoudini/__init__.py b/cortex-9.0.0-a10/python/IECoreHoudini/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreHoudini/__init__.py rename to cortex-9.0.0-a10/python/IECoreHoudini/__init__.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/AttributeEditorControl.py b/cortex-9.0.0-a10/python/IECoreMaya/AttributeEditorControl.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/AttributeEditorControl.py rename to cortex-9.0.0-a10/python/IECoreMaya/AttributeEditorControl.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/BakeTransform.py b/cortex-9.0.0-a10/python/IECoreMaya/BakeTransform.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/BakeTransform.py rename to cortex-9.0.0-a10/python/IECoreMaya/BakeTransform.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/BoolParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/BoolParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/BoolParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/BoolParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/BoxParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/BoxParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/BoxParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/BoxParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ClassParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ClassParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ClassParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ClassParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ClassVectorParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ClassVectorParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ClassVectorParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ClassVectorParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/Collapsible.py b/cortex-9.0.0-a10/python/IECoreMaya/Collapsible.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/Collapsible.py rename to cortex-9.0.0-a10/python/IECoreMaya/Collapsible.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ColorParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ColorParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ColorParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ColorParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/CompoundParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/CompoundParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/CompoundParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/CompoundParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/DAGPathParameter.py b/cortex-9.0.0-a10/python/IECoreMaya/DAGPathParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/DAGPathParameter.py rename to cortex-9.0.0-a10/python/IECoreMaya/DAGPathParameter.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/DAGPathVectorParameter.py b/cortex-9.0.0-a10/python/IECoreMaya/DAGPathVectorParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/DAGPathVectorParameter.py rename to cortex-9.0.0-a10/python/IECoreMaya/DAGPathVectorParameter.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/DirNameParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/DirNameParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/DirNameParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/DirNameParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FileBrowser.py b/cortex-9.0.0-a10/python/IECoreMaya/FileBrowser.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FileBrowser.py rename to cortex-9.0.0-a10/python/IECoreMaya/FileBrowser.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FileDialog.py b/cortex-9.0.0-a10/python/IECoreMaya/FileDialog.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FileDialog.py rename to cortex-9.0.0-a10/python/IECoreMaya/FileDialog.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FileNameParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/FileNameParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FileNameParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/FileNameParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FileSequenceParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/FileSequenceParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FileSequenceParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/FileSequenceParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnConverterHolder.py b/cortex-9.0.0-a10/python/IECoreMaya/FnConverterHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnConverterHolder.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnConverterHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnDagNode.py b/cortex-9.0.0-a10/python/IECoreMaya/FnDagNode.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnDagNode.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnDagNode.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnOpHolder.py b/cortex-9.0.0-a10/python/IECoreMaya/FnOpHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnOpHolder.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnOpHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnParameterisedHolder.py b/cortex-9.0.0-a10/python/IECoreMaya/FnParameterisedHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnParameterisedHolder.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnParameterisedHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnParameterisedHolderSet.py b/cortex-9.0.0-a10/python/IECoreMaya/FnParameterisedHolderSet.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnParameterisedHolderSet.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnParameterisedHolderSet.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnProceduralHolder.py b/cortex-9.0.0-a10/python/IECoreMaya/FnProceduralHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnProceduralHolder.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnProceduralHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnSceneShape.py b/cortex-9.0.0-a10/python/IECoreMaya/FnSceneShape.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnSceneShape.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnSceneShape.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/FnTransientParameterisedHolderNode.py b/cortex-9.0.0-a10/python/IECoreMaya/FnTransientParameterisedHolderNode.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/FnTransientParameterisedHolderNode.py rename to cortex-9.0.0-a10/python/IECoreMaya/FnTransientParameterisedHolderNode.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/GenericParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/GenericParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/GenericParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/GenericParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/GeometryCombinerUI.py b/cortex-9.0.0-a10/python/IECoreMaya/GeometryCombinerUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/GeometryCombinerUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/GeometryCombinerUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/LineSegmentParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/LineSegmentParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/LineSegmentParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/LineSegmentParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ManipulatorUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ManipulatorUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ManipulatorUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ManipulatorUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/MayaTypeId.py b/cortex-9.0.0-a10/python/IECoreMaya/MayaTypeId.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/MayaTypeId.py rename to cortex-9.0.0-a10/python/IECoreMaya/MayaTypeId.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/Menu.py b/cortex-9.0.0-a10/python/IECoreMaya/Menu.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/Menu.py rename to cortex-9.0.0-a10/python/IECoreMaya/Menu.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/Menus.py b/cortex-9.0.0-a10/python/IECoreMaya/Menus.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/Menus.py rename to cortex-9.0.0-a10/python/IECoreMaya/Menus.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/MeshOpHolderUtil.py b/cortex-9.0.0-a10/python/IECoreMaya/MeshOpHolderUtil.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/MeshOpHolderUtil.py rename to cortex-9.0.0-a10/python/IECoreMaya/MeshOpHolderUtil.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ModalDialogue.py b/cortex-9.0.0-a10/python/IECoreMaya/ModalDialogue.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ModalDialogue.py rename to cortex-9.0.0-a10/python/IECoreMaya/ModalDialogue.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/NodeParameter.py b/cortex-9.0.0-a10/python/IECoreMaya/NodeParameter.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/NodeParameter.py rename to cortex-9.0.0-a10/python/IECoreMaya/NodeParameter.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/NoteParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/NoteParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/NoteParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/NoteParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/NumericParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/NumericParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/NumericParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/NumericParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/NumericVectorParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/NumericVectorParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/NumericVectorParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/NumericVectorParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/OpWindow.py b/cortex-9.0.0-a10/python/IECoreMaya/OpWindow.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/OpWindow.py rename to cortex-9.0.0-a10/python/IECoreMaya/OpWindow.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/Panel.py b/cortex-9.0.0-a10/python/IECoreMaya/Panel.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/Panel.py rename to cortex-9.0.0-a10/python/IECoreMaya/Panel.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ParameterClipboardUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ParameterClipboardUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ParameterClipboardUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ParameterClipboardUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ParameterPanel.py b/cortex-9.0.0-a10/python/IECoreMaya/ParameterPanel.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ParameterPanel.py rename to cortex-9.0.0-a10/python/IECoreMaya/ParameterPanel.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/PathParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/PathParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/PathParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/PathParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/PresetsOnlyParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/PresetsOnlyParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/PresetsOnlyParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/PresetsOnlyParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/PresetsUI.py b/cortex-9.0.0-a10/python/IECoreMaya/PresetsUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/PresetsUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/PresetsUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ProceduralHolderUI.py b/cortex-9.0.0-a10/python/IECoreMaya/ProceduralHolderUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ProceduralHolderUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/ProceduralHolderUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/SceneShapeUI.py b/cortex-9.0.0-a10/python/IECoreMaya/SceneShapeUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/SceneShapeUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/SceneShapeUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/ScopedSelection.py b/cortex-9.0.0-a10/python/IECoreMaya/ScopedSelection.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/ScopedSelection.py rename to cortex-9.0.0-a10/python/IECoreMaya/ScopedSelection.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/SplineParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/SplineParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/SplineParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/SplineParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/StringParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/StringParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/StringParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/StringParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/StringUtil.py b/cortex-9.0.0-a10/python/IECoreMaya/StringUtil.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/StringUtil.py rename to cortex-9.0.0-a10/python/IECoreMaya/StringUtil.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/StringVectorParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/StringVectorParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/StringVectorParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/StringVectorParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/TemporaryAttributeValues.py b/cortex-9.0.0-a10/python/IECoreMaya/TemporaryAttributeValues.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/TemporaryAttributeValues.py rename to cortex-9.0.0-a10/python/IECoreMaya/TemporaryAttributeValues.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/TestCase.py b/cortex-9.0.0-a10/python/IECoreMaya/TestCase.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/TestCase.py rename to cortex-9.0.0-a10/python/IECoreMaya/TestCase.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/TestProgram.py b/cortex-9.0.0-a10/python/IECoreMaya/TestProgram.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/TestProgram.py rename to cortex-9.0.0-a10/python/IECoreMaya/TestProgram.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/TransformationMatrixParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/TransformationMatrixParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/TransformationMatrixParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/TransformationMatrixParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/TransientParameterisedHolderNode.py b/cortex-9.0.0-a10/python/IECoreMaya/TransientParameterisedHolderNode.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/TransientParameterisedHolderNode.py rename to cortex-9.0.0-a10/python/IECoreMaya/TransientParameterisedHolderNode.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/UIElement.py b/cortex-9.0.0-a10/python/IECoreMaya/UIElement.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/UIElement.py rename to cortex-9.0.0-a10/python/IECoreMaya/UIElement.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/UITemplate.py b/cortex-9.0.0-a10/python/IECoreMaya/UITemplate.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/UITemplate.py rename to cortex-9.0.0-a10/python/IECoreMaya/UITemplate.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/UndoDisabled.py b/cortex-9.0.0-a10/python/IECoreMaya/UndoDisabled.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/UndoDisabled.py rename to cortex-9.0.0-a10/python/IECoreMaya/UndoDisabled.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/VectorParameterUI.py b/cortex-9.0.0-a10/python/IECoreMaya/VectorParameterUI.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/VectorParameterUI.py rename to cortex-9.0.0-a10/python/IECoreMaya/VectorParameterUI.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/WaitCursor.py b/cortex-9.0.0-a10/python/IECoreMaya/WaitCursor.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/WaitCursor.py rename to cortex-9.0.0-a10/python/IECoreMaya/WaitCursor.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/__init__.py b/cortex-9.0.0-a10/python/IECoreMaya/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/__init__.py rename to cortex-9.0.0-a10/python/IECoreMaya/__init__.py diff --git a/cortex-9.0.0-a6/python/IECoreMaya/mayaDo.py b/cortex-9.0.0-a10/python/IECoreMaya/mayaDo.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreMaya/mayaDo.py rename to cortex-9.0.0-a10/python/IECoreMaya/mayaDo.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/FnAxis.py b/cortex-9.0.0-a10/python/IECoreNuke/FnAxis.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/FnAxis.py rename to cortex-9.0.0-a10/python/IECoreNuke/FnAxis.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/FnOpHolder.py b/cortex-9.0.0-a10/python/IECoreNuke/FnOpHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/FnOpHolder.py rename to cortex-9.0.0-a10/python/IECoreNuke/FnOpHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/FnParameterisedHolder.py b/cortex-9.0.0-a10/python/IECoreNuke/FnParameterisedHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/FnParameterisedHolder.py rename to cortex-9.0.0-a10/python/IECoreNuke/FnParameterisedHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/FnProceduralHolder.py b/cortex-9.0.0-a10/python/IECoreNuke/FnProceduralHolder.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/FnProceduralHolder.py rename to cortex-9.0.0-a10/python/IECoreNuke/FnProceduralHolder.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/KnobAccessors.py b/cortex-9.0.0-a10/python/IECoreNuke/KnobAccessors.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/KnobAccessors.py rename to cortex-9.0.0-a10/python/IECoreNuke/KnobAccessors.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/KnobConverters.py b/cortex-9.0.0-a10/python/IECoreNuke/KnobConverters.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/KnobConverters.py rename to cortex-9.0.0-a10/python/IECoreNuke/KnobConverters.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/Menus.py b/cortex-9.0.0-a10/python/IECoreNuke/Menus.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/Menus.py rename to cortex-9.0.0-a10/python/IECoreNuke/Menus.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/StringUtil.py b/cortex-9.0.0-a10/python/IECoreNuke/StringUtil.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/StringUtil.py rename to cortex-9.0.0-a10/python/IECoreNuke/StringUtil.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/TestCase.py b/cortex-9.0.0-a10/python/IECoreNuke/TestCase.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/TestCase.py rename to cortex-9.0.0-a10/python/IECoreNuke/TestCase.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/UndoManagers.py b/cortex-9.0.0-a10/python/IECoreNuke/UndoManagers.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/UndoManagers.py rename to cortex-9.0.0-a10/python/IECoreNuke/UndoManagers.py diff --git a/cortex-9.0.0-a6/python/IECoreNuke/__init__.py b/cortex-9.0.0-a10/python/IECoreNuke/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreNuke/__init__.py rename to cortex-9.0.0-a10/python/IECoreNuke/__init__.py diff --git a/cortex-9.0.0-a6/python/IECoreRI/ExecuteProcedural.py b/cortex-9.0.0-a10/python/IECoreRI/ExecuteProcedural.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreRI/ExecuteProcedural.py rename to cortex-9.0.0-a10/python/IECoreRI/ExecuteProcedural.py diff --git a/cortex-9.0.0-a6/python/IECoreRI/MakeRibOp.py b/cortex-9.0.0-a10/python/IECoreRI/MakeRibOp.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreRI/MakeRibOp.py rename to cortex-9.0.0-a10/python/IECoreRI/MakeRibOp.py diff --git a/cortex-9.0.0-a6/python/IECoreRI/TestCase.py b/cortex-9.0.0-a10/python/IECoreRI/TestCase.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreRI/TestCase.py rename to cortex-9.0.0-a10/python/IECoreRI/TestCase.py diff --git a/cortex-9.0.0-a6/python/IECoreRI/__init__.py b/cortex-9.0.0-a10/python/IECoreRI/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreRI/__init__.py rename to cortex-9.0.0-a10/python/IECoreRI/__init__.py diff --git a/cortex-9.0.0-a6/python/IECoreTruelight/__init__.py b/cortex-9.0.0-a10/python/IECoreTruelight/__init__.py similarity index 100% rename from cortex-9.0.0-a6/python/IECoreTruelight/__init__.py rename to cortex-9.0.0-a10/python/IECoreTruelight/__init__.py diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/ArrayAlgo.h b/cortex-9.0.0-a10/rsl/IECoreRI/ArrayAlgo.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/ArrayAlgo.h rename to cortex-9.0.0-a10/rsl/IECoreRI/ArrayAlgo.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Brownian.h b/cortex-9.0.0-a10/rsl/IECoreRI/Brownian.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Brownian.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Brownian.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/ColorAlgo.h b/cortex-9.0.0-a10/rsl/IECoreRI/ColorAlgo.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/ColorAlgo.h rename to cortex-9.0.0-a10/rsl/IECoreRI/ColorAlgo.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/CompositeAlgo.h b/cortex-9.0.0-a10/rsl/IECoreRI/CompositeAlgo.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/CompositeAlgo.h rename to cortex-9.0.0-a10/rsl/IECoreRI/CompositeAlgo.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Derivative.h b/cortex-9.0.0-a10/rsl/IECoreRI/Derivative.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Derivative.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Derivative.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Distance.h b/cortex-9.0.0-a10/rsl/IECoreRI/Distance.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Distance.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Distance.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/EuclideanToSphericalTransform.h b/cortex-9.0.0-a10/rsl/IECoreRI/EuclideanToSphericalTransform.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/EuclideanToSphericalTransform.h rename to cortex-9.0.0-a10/rsl/IECoreRI/EuclideanToSphericalTransform.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Filter.h b/cortex-9.0.0-a10/rsl/IECoreRI/Filter.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Filter.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Filter.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Gaussian.h b/cortex-9.0.0-a10/rsl/IECoreRI/Gaussian.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Gaussian.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Gaussian.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Marschner.h b/cortex-9.0.0-a10/rsl/IECoreRI/Marschner.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Marschner.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Marschner.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Marschner.inl b/cortex-9.0.0-a10/rsl/IECoreRI/Marschner.inl similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Marschner.inl rename to cortex-9.0.0-a10/rsl/IECoreRI/Marschner.inl diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Noise.h b/cortex-9.0.0-a10/rsl/IECoreRI/Noise.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Noise.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Noise.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/RayAlgo.h b/cortex-9.0.0-a10/rsl/IECoreRI/RayAlgo.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/RayAlgo.h rename to cortex-9.0.0-a10/rsl/IECoreRI/RayAlgo.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Roots.h b/cortex-9.0.0-a10/rsl/IECoreRI/Roots.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Roots.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Roots.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/SphericalToEuclideanTransform.h b/cortex-9.0.0-a10/rsl/IECoreRI/SphericalToEuclideanTransform.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/SphericalToEuclideanTransform.h rename to cortex-9.0.0-a10/rsl/IECoreRI/SphericalToEuclideanTransform.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Spline.h b/cortex-9.0.0-a10/rsl/IECoreRI/Spline.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Spline.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Spline.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/StringAlgo.h b/cortex-9.0.0-a10/rsl/IECoreRI/StringAlgo.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/StringAlgo.h rename to cortex-9.0.0-a10/rsl/IECoreRI/StringAlgo.h diff --git a/cortex-9.0.0-a6/rsl/IECoreRI/Turbulence.h b/cortex-9.0.0-a10/rsl/IECoreRI/Turbulence.h similarity index 100% rename from cortex-9.0.0-a6/rsl/IECoreRI/Turbulence.h rename to cortex-9.0.0-a10/rsl/IECoreRI/Turbulence.h diff --git a/cortex-9.0.0-a6/scripts/do b/cortex-9.0.0-a10/scripts/do similarity index 100% rename from cortex-9.0.0-a6/scripts/do rename to cortex-9.0.0-a10/scripts/do diff --git a/cortex-9.0.0-a6/src/IECore/AddSmoothSkinningInfluencesOp.cpp b/cortex-9.0.0-a10/src/IECore/AddSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AddSmoothSkinningInfluencesOp.cpp rename to cortex-9.0.0-a10/src/IECore/AddSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/AlexaLogcToLinearOp.cpp b/cortex-9.0.0-a10/src/IECore/AlexaLogcToLinearOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AlexaLogcToLinearOp.cpp rename to cortex-9.0.0-a10/src/IECore/AlexaLogcToLinearOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/AssociatedLegendre.cpp b/cortex-9.0.0-a10/src/IECore/AssociatedLegendre.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AssociatedLegendre.cpp rename to cortex-9.0.0-a10/src/IECore/AssociatedLegendre.cpp diff --git a/cortex-9.0.0-a6/src/IECore/AttributeBlock.cpp b/cortex-9.0.0-a10/src/IECore/AttributeBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AttributeBlock.cpp rename to cortex-9.0.0-a10/src/IECore/AttributeBlock.cpp diff --git a/cortex-9.0.0-a6/src/IECore/AttributeCache.cpp b/cortex-9.0.0-a10/src/IECore/AttributeCache.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AttributeCache.cpp rename to cortex-9.0.0-a10/src/IECore/AttributeCache.cpp diff --git a/cortex-9.0.0-a6/src/IECore/AttributeState.cpp b/cortex-9.0.0-a10/src/IECore/AttributeState.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/AttributeState.cpp rename to cortex-9.0.0-a10/src/IECore/AttributeState.cpp diff --git a/cortex-9.0.0-a6/src/IECore/BinaryFrameList.cpp b/cortex-9.0.0-a10/src/IECore/BinaryFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/BinaryFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/BinaryFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/BlindDataHolder.cpp b/cortex-9.0.0-a10/src/IECore/BlindDataHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/BlindDataHolder.cpp rename to cortex-9.0.0-a10/src/IECore/BlindDataHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CINImageReader.cpp b/cortex-9.0.0-a10/src/IECore/CINImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CINImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/CINImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CINImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/CINImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CINImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/CINImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CachedReader.cpp b/cortex-9.0.0-a10/src/IECore/CachedReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CachedReader.cpp rename to cortex-9.0.0-a10/src/IECore/CachedReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CamelCase.cpp b/cortex-9.0.0-a10/src/IECore/CamelCase.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CamelCase.cpp rename to cortex-9.0.0-a10/src/IECore/CamelCase.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Camera.cpp b/cortex-9.0.0-a10/src/IECore/Camera.cpp similarity index 95% rename from cortex-9.0.0-a6/src/IECore/Camera.cpp rename to cortex-9.0.0-a10/src/IECore/Camera.cpp index ae293bf2de..d256e24e3e 100644 --- a/cortex-9.0.0-a6/src/IECore/Camera.cpp +++ b/cortex-9.0.0-a10/src/IECore/Camera.cpp @@ -221,6 +221,18 @@ void Camera::addStandardParameters() parameters()["resolution"] = new V2iData( resolution ); } + // pixel aspect ratio + float pixelAspectRatio = 0.0f; + if( FloatData *pixelAspectRatioData = parametersData()->member( "pixelAspectRatio" ) ) + { + pixelAspectRatio = pixelAspectRatioData->readable(); + } + if( pixelAspectRatio == 0.0f ) + { + pixelAspectRatio = 1.0f; + parameters()["pixelAspectRatio"] = new FloatData( pixelAspectRatio ); + } + // screen window Box2f screenWindow; CompoundDataMap::const_iterator screenWindowIt=parameters().find( "screenWindow" ); @@ -230,7 +242,7 @@ void Camera::addStandardParameters() } if( screenWindow.isEmpty() ) { - float aspectRatio = (float)resolution.x/(float)resolution.y; + float aspectRatio = ((float)resolution.x * pixelAspectRatio)/(float)resolution.y; if( aspectRatio < 1.0f ) { screenWindow.min.x = -1; diff --git a/cortex-9.0.0-a6/src/IECore/CameraController.cpp b/cortex-9.0.0-a10/src/IECore/CameraController.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CameraController.cpp rename to cortex-9.0.0-a10/src/IECore/CameraController.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CapturingRenderer.cpp b/cortex-9.0.0-a10/src/IECore/CapturingRenderer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CapturingRenderer.cpp rename to cortex-9.0.0-a10/src/IECore/CapturingRenderer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ChannelOp.cpp b/cortex-9.0.0-a10/src/IECore/ChannelOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ChannelOp.cpp rename to cortex-9.0.0-a10/src/IECore/ChannelOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CineonToLinearOp.cpp b/cortex-9.0.0-a10/src/IECore/CineonToLinearOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CineonToLinearOp.cpp rename to cortex-9.0.0-a10/src/IECore/CineonToLinearOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ClampOp.cpp b/cortex-9.0.0-a10/src/IECore/ClampOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ClampOp.cpp rename to cortex-9.0.0-a10/src/IECore/ClampOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ClientDisplayDriver.cpp b/cortex-9.0.0-a10/src/IECore/ClientDisplayDriver.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ClientDisplayDriver.cpp rename to cortex-9.0.0-a10/src/IECore/ClientDisplayDriver.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ColorSpaceTransformOp.cpp b/cortex-9.0.0-a10/src/IECore/ColorSpaceTransformOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ColorSpaceTransformOp.cpp rename to cortex-9.0.0-a10/src/IECore/ColorSpaceTransformOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ColorTransformOp.cpp b/cortex-9.0.0-a10/src/IECore/ColorTransformOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ColorTransformOp.cpp rename to cortex-9.0.0-a10/src/IECore/ColorTransformOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundData.cpp b/cortex-9.0.0-a10/src/IECore/CompoundData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundData.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundDataBase.cpp b/cortex-9.0.0-a10/src/IECore/CompoundDataBase.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundDataBase.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundDataBase.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundFrameList.cpp b/cortex-9.0.0-a10/src/IECore/CompoundFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundMessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/CompoundMessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundMessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundMessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundObject.cpp b/cortex-9.0.0-a10/src/IECore/CompoundObject.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundObject.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundObject.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompoundParameter.cpp b/cortex-9.0.0-a10/src/IECore/CompoundParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompoundParameter.cpp rename to cortex-9.0.0-a10/src/IECore/CompoundParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CompressSmoothSkinningDataOp.cpp b/cortex-9.0.0-a10/src/IECore/CompressSmoothSkinningDataOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CompressSmoothSkinningDataOp.cpp rename to cortex-9.0.0-a10/src/IECore/CompressSmoothSkinningDataOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ContrastSmoothSkinningWeightsOp.cpp b/cortex-9.0.0-a10/src/IECore/ContrastSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ContrastSmoothSkinningWeightsOp.cpp rename to cortex-9.0.0-a10/src/IECore/ContrastSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Converter.cpp b/cortex-9.0.0-a10/src/IECore/Converter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Converter.cpp rename to cortex-9.0.0-a10/src/IECore/Converter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CoordinateSystem.cpp b/cortex-9.0.0-a10/src/IECore/CoordinateSystem.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CoordinateSystem.cpp rename to cortex-9.0.0-a10/src/IECore/CoordinateSystem.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CubeColorLookupData.cpp b/cortex-9.0.0-a10/src/IECore/CubeColorLookupData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CubeColorLookupData.cpp rename to cortex-9.0.0-a10/src/IECore/CubeColorLookupData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CubeColorLookupParameter.cpp b/cortex-9.0.0-a10/src/IECore/CubeColorLookupParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CubeColorLookupParameter.cpp rename to cortex-9.0.0-a10/src/IECore/CubeColorLookupParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CubeColorTransformOp.cpp b/cortex-9.0.0-a10/src/IECore/CubeColorTransformOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CubeColorTransformOp.cpp rename to cortex-9.0.0-a10/src/IECore/CubeColorTransformOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurveExtrudeOp.cpp b/cortex-9.0.0-a10/src/IECore/CurveExtrudeOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurveExtrudeOp.cpp rename to cortex-9.0.0-a10/src/IECore/CurveExtrudeOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurveLineariser.cpp b/cortex-9.0.0-a10/src/IECore/CurveLineariser.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurveLineariser.cpp rename to cortex-9.0.0-a10/src/IECore/CurveLineariser.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurveTangentsOp.cpp b/cortex-9.0.0-a10/src/IECore/CurveTangentsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurveTangentsOp.cpp rename to cortex-9.0.0-a10/src/IECore/CurveTangentsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurveTracer.cpp b/cortex-9.0.0-a10/src/IECore/CurveTracer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurveTracer.cpp rename to cortex-9.0.0-a10/src/IECore/CurveTracer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurvesMergeOp.cpp b/cortex-9.0.0-a10/src/IECore/CurvesMergeOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurvesMergeOp.cpp rename to cortex-9.0.0-a10/src/IECore/CurvesMergeOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurvesPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/CurvesPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurvesPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/CurvesPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/CurvesPrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/CurvesPrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/CurvesPrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/CurvesPrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DPXImageReader.cpp b/cortex-9.0.0-a10/src/IECore/DPXImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DPXImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/DPXImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DPXImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/DPXImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DPXImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/DPXImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Data.cpp b/cortex-9.0.0-a10/src/IECore/Data.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Data.cpp rename to cortex-9.0.0-a10/src/IECore/Data.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DataCastOp.cpp b/cortex-9.0.0-a10/src/IECore/DataCastOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DataCastOp.cpp rename to cortex-9.0.0-a10/src/IECore/DataCastOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DataConvertOp.cpp b/cortex-9.0.0-a10/src/IECore/DataConvertOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DataConvertOp.cpp rename to cortex-9.0.0-a10/src/IECore/DataConvertOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DataInterleaveOp.cpp b/cortex-9.0.0-a10/src/IECore/DataInterleaveOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DataInterleaveOp.cpp rename to cortex-9.0.0-a10/src/IECore/DataInterleaveOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DataPromoteOp.cpp b/cortex-9.0.0-a10/src/IECore/DataPromoteOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DataPromoteOp.cpp rename to cortex-9.0.0-a10/src/IECore/DataPromoteOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DateTimeData.cpp b/cortex-9.0.0-a10/src/IECore/DateTimeData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DateTimeData.cpp rename to cortex-9.0.0-a10/src/IECore/DateTimeData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DateTimeParameter.cpp b/cortex-9.0.0-a10/src/IECore/DateTimeParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DateTimeParameter.cpp rename to cortex-9.0.0-a10/src/IECore/DateTimeParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DecompressSmoothSkinningDataOp.cpp b/cortex-9.0.0-a10/src/IECore/DecompressSmoothSkinningDataOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DecompressSmoothSkinningDataOp.cpp rename to cortex-9.0.0-a10/src/IECore/DecompressSmoothSkinningDataOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DeepImageConverter.cpp b/cortex-9.0.0-a10/src/IECore/DeepImageConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DeepImageConverter.cpp rename to cortex-9.0.0-a10/src/IECore/DeepImageConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DeepImageReader.cpp b/cortex-9.0.0-a10/src/IECore/DeepImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/DeepImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DeepImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/DeepImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DeepImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/DeepImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DeepPixel.cpp b/cortex-9.0.0-a10/src/IECore/DeepPixel.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DeepPixel.cpp rename to cortex-9.0.0-a10/src/IECore/DeepPixel.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DirNameParameter.cpp b/cortex-9.0.0-a10/src/IECore/DirNameParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DirNameParameter.cpp rename to cortex-9.0.0-a10/src/IECore/DirNameParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DiskPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/DiskPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DiskPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/DiskPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Display.cpp b/cortex-9.0.0-a10/src/IECore/Display.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Display.cpp rename to cortex-9.0.0-a10/src/IECore/Display.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DisplayDriver.cpp b/cortex-9.0.0-a10/src/IECore/DisplayDriver.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DisplayDriver.cpp rename to cortex-9.0.0-a10/src/IECore/DisplayDriver.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DisplayDriverServer.cpp b/cortex-9.0.0-a10/src/IECore/DisplayDriverServer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DisplayDriverServer.cpp rename to cortex-9.0.0-a10/src/IECore/DisplayDriverServer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/DisplayDriverServerHeader.cpp b/cortex-9.0.0-a10/src/IECore/DisplayDriverServerHeader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/DisplayDriverServerHeader.cpp rename to cortex-9.0.0-a10/src/IECore/DisplayDriverServerHeader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EXRDeepImageReader.cpp b/cortex-9.0.0-a10/src/IECore/EXRDeepImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EXRDeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/EXRDeepImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EXRDeepImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/EXRDeepImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EXRDeepImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/EXRDeepImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EXRImageReader.cpp b/cortex-9.0.0-a10/src/IECore/EXRImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EXRImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/EXRImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EXRImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/EXRImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EXRImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/EXRImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EditBlock.cpp b/cortex-9.0.0-a10/src/IECore/EditBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EditBlock.cpp rename to cortex-9.0.0-a10/src/IECore/EditBlock.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EmptyFrameList.cpp b/cortex-9.0.0-a10/src/IECore/EmptyFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EmptyFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/EmptyFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EnvMapSHProjector.cpp b/cortex-9.0.0-a10/src/IECore/EnvMapSHProjector.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EnvMapSHProjector.cpp rename to cortex-9.0.0-a10/src/IECore/EnvMapSHProjector.cpp diff --git a/cortex-9.0.0-a6/src/IECore/EnvMapSampler.cpp b/cortex-9.0.0-a10/src/IECore/EnvMapSampler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/EnvMapSampler.cpp rename to cortex-9.0.0-a10/src/IECore/EnvMapSampler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Exception.cpp b/cortex-9.0.0-a10/src/IECore/Exception.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Exception.cpp rename to cortex-9.0.0-a10/src/IECore/Exception.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ExclusionFrameList.cpp b/cortex-9.0.0-a10/src/IECore/ExclusionFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ExclusionFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/ExclusionFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ExternalProcedural.cpp b/cortex-9.0.0-a10/src/IECore/ExternalProcedural.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ExternalProcedural.cpp rename to cortex-9.0.0-a10/src/IECore/ExternalProcedural.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FaceAreaOp.cpp b/cortex-9.0.0-a10/src/IECore/FaceAreaOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FaceAreaOp.cpp rename to cortex-9.0.0-a10/src/IECore/FaceAreaOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FaceVaryingPromotionOp.cpp b/cortex-9.0.0-a10/src/IECore/FaceVaryingPromotionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FaceVaryingPromotionOp.cpp rename to cortex-9.0.0-a10/src/IECore/FaceVaryingPromotionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileIndexedIO.cpp b/cortex-9.0.0-a10/src/IECore/FileIndexedIO.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileIndexedIO.cpp rename to cortex-9.0.0-a10/src/IECore/FileIndexedIO.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileNameParameter.cpp b/cortex-9.0.0-a10/src/IECore/FileNameParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileNameParameter.cpp rename to cortex-9.0.0-a10/src/IECore/FileNameParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileSequence.cpp b/cortex-9.0.0-a10/src/IECore/FileSequence.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileSequence.cpp rename to cortex-9.0.0-a10/src/IECore/FileSequence.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileSequenceFunctions.cpp b/cortex-9.0.0-a10/src/IECore/FileSequenceFunctions.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileSequenceFunctions.cpp rename to cortex-9.0.0-a10/src/IECore/FileSequenceFunctions.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileSequenceParameter.cpp b/cortex-9.0.0-a10/src/IECore/FileSequenceParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileSequenceParameter.cpp rename to cortex-9.0.0-a10/src/IECore/FileSequenceParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FileSequenceVectorParameter.cpp b/cortex-9.0.0-a10/src/IECore/FileSequenceVectorParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FileSequenceVectorParameter.cpp rename to cortex-9.0.0-a10/src/IECore/FileSequenceVectorParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FilteredMessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/FilteredMessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FilteredMessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/FilteredMessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Font.cpp b/cortex-9.0.0-a10/src/IECore/Font.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Font.cpp rename to cortex-9.0.0-a10/src/IECore/Font.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FrameList.cpp b/cortex-9.0.0-a10/src/IECore/FrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FrameList.cpp rename to cortex-9.0.0-a10/src/IECore/FrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FrameListParameter.cpp b/cortex-9.0.0-a10/src/IECore/FrameListParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FrameListParameter.cpp rename to cortex-9.0.0-a10/src/IECore/FrameListParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FrameRange.cpp b/cortex-9.0.0-a10/src/IECore/FrameRange.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FrameRange.cpp rename to cortex-9.0.0-a10/src/IECore/FrameRange.cpp diff --git a/cortex-9.0.0-a6/src/IECore/FromCoreConverter.cpp b/cortex-9.0.0-a10/src/IECore/FromCoreConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/FromCoreConverter.cpp rename to cortex-9.0.0-a10/src/IECore/FromCoreConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Grade.cpp b/cortex-9.0.0-a10/src/IECore/Grade.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Grade.cpp rename to cortex-9.0.0-a10/src/IECore/Grade.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Group.cpp b/cortex-9.0.0-a10/src/IECore/Group.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Group.cpp rename to cortex-9.0.0-a10/src/IECore/Group.cpp diff --git a/cortex-9.0.0-a6/src/IECore/HdrMergeOp.cpp b/cortex-9.0.0-a10/src/IECore/HdrMergeOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/HdrMergeOp.cpp rename to cortex-9.0.0-a10/src/IECore/HdrMergeOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/HeaderGenerator.cpp b/cortex-9.0.0-a10/src/IECore/HeaderGenerator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/HeaderGenerator.cpp rename to cortex-9.0.0-a10/src/IECore/HeaderGenerator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/HitMissTransform.cpp b/cortex-9.0.0-a10/src/IECore/HitMissTransform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/HitMissTransform.cpp rename to cortex-9.0.0-a10/src/IECore/HitMissTransform.cpp diff --git a/cortex-9.0.0-a6/src/IECore/IECore.cpp b/cortex-9.0.0-a10/src/IECore/IECore.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/IECore.cpp rename to cortex-9.0.0-a10/src/IECore/IECore.cpp diff --git a/cortex-9.0.0-a6/src/IECore/IFFFile.cpp b/cortex-9.0.0-a10/src/IECore/IFFFile.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/IFFFile.cpp rename to cortex-9.0.0-a10/src/IECore/IFFFile.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageCompositeOp.cpp b/cortex-9.0.0-a10/src/IECore/ImageCompositeOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageCompositeOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImageCompositeOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageConvolveOp.cpp b/cortex-9.0.0-a10/src/IECore/ImageConvolveOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageConvolveOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImageConvolveOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageCropOp.cpp b/cortex-9.0.0-a10/src/IECore/ImageCropOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageCropOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImageCropOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageDiffOp.cpp b/cortex-9.0.0-a10/src/IECore/ImageDiffOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageDiffOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImageDiffOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageDisplayDriver.cpp b/cortex-9.0.0-a10/src/IECore/ImageDisplayDriver.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageDisplayDriver.cpp rename to cortex-9.0.0-a10/src/IECore/ImageDisplayDriver.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImagePremultiplyOp.cpp b/cortex-9.0.0-a10/src/IECore/ImagePremultiplyOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImagePremultiplyOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImagePremultiplyOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImagePrimitive.cpp b/cortex-9.0.0-a10/src/IECore/ImagePrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImagePrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/ImagePrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImagePrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/ImagePrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImagePrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/ImagePrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageReader.cpp b/cortex-9.0.0-a10/src/IECore/ImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/ImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageThinner.cpp b/cortex-9.0.0-a10/src/IECore/ImageThinner.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageThinner.cpp rename to cortex-9.0.0-a10/src/IECore/ImageThinner.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageUnpremultiplyOp.cpp b/cortex-9.0.0-a10/src/IECore/ImageUnpremultiplyOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageUnpremultiplyOp.cpp rename to cortex-9.0.0-a10/src/IECore/ImageUnpremultiplyOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/ImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/ImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/IndexedIO.cpp b/cortex-9.0.0-a10/src/IECore/IndexedIO.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/IndexedIO.cpp rename to cortex-9.0.0-a10/src/IECore/IndexedIO.cpp diff --git a/cortex-9.0.0-a6/src/IECore/InternedString.cpp b/cortex-9.0.0-a10/src/IECore/InternedString.cpp similarity index 64% rename from cortex-9.0.0-a6/src/IECore/InternedString.cpp rename to cortex-9.0.0-a10/src/IECore/InternedString.cpp index 5b50982c30..5a260c1de8 100644 --- a/cortex-9.0.0-a6/src/IECore/InternedString.cpp +++ b/cortex-9.0.0-a10/src/IECore/InternedString.cpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // -// Copyright (c) 2009-2013, Image Engine Design Inc. All rights reserved. +// Copyright (c) 2009-2014, 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,9 +38,9 @@ #include "tbb/concurrent_hash_map.h" #include "boost/multi_index_container.hpp" +#include "boost/multi_index/hashed_index.hpp" #include "boost/lexical_cast.hpp" -#include "IECore/HashTable.h" #include "IECore/InternedString.h" namespace IECore @@ -49,12 +49,89 @@ namespace IECore namespace Detail { +// Simple type for specifying a range of characters, to +// represent non-null-terminated strings. +typedef std::pair CharRange; + +// Hash for strings of various types. +// By overloading it for multiple types, we are able to do +// lookups into HashSet using any type as a key, and without +// needing to construct a temporary std::string when the type +// is a raw c string. +struct Hash +{ + + // Dan Bernstein's original string hash + size_t operator()( const char *s ) const + { + size_t hash = 5381; + while( *s ) + { + hash = ( ( hash << 5 ) + hash ) + *s++; + } + + return hash; + } + + size_t operator()( const std::string &s ) const + { + return (*this)( s.c_str() ); + } + + size_t operator()( const CharRange &range ) const + { + size_t hash = 5381; + for( const char *s = range.first; s != range.second; ++s ) + { + hash = ( ( hash << 5 ) + hash ) + *s; + } + + return hash; + } + +}; + +// Equality operator between strings of various types. +// As above, this allows HashSet lookups to be performed +// using any type, without the overhead of constructing +// temporary std::strings. +struct Equal +{ + + bool operator()( const std::string &s1, const std::string &s2 ) const + { + return s1 == s2; + } + + bool operator()( const char *c, const std::string &s ) const + { + return strcmp( c, s.c_str() )==0; + } + + bool operator()( const std::string &s, const char *c ) const + { + return strcmp( c, s.c_str() )==0; + } + + bool operator()( const CharRange &c, const std::string &s ) const + { + return s.compare( 0, std::string::npos, c.first, c.second - c.first )==0; + } + + bool operator()( const std::string &s, const CharRange &c ) const + { + return s.compare( 0, std::string::npos, c.first, c.second - c.first )==0; + } + +}; + typedef boost::multi_index::multi_index_container< std::string, boost::multi_index::indexed_by< boost::multi_index::hashed_unique< boost::multi_index::identity, - Hash + Hash, + Equal > > > HashSet; @@ -75,26 +152,31 @@ static Mutex *mutex() return &g_mutex; } -struct StringCStringEqual +} // namespace Detail + +const std::string *InternedString::internedString( const char *value ) { - bool operator()( const char *c, const std::string &s ) const + Detail::HashSet *hashSet = Detail::hashSet(); + Detail::Index &hashIndex = hashSet->get<0>(); + Detail::Mutex::scoped_lock lock( *Detail::mutex(), false ); // read-only lock + Detail::HashSet::const_iterator it = hashIndex.find( value ); + if( it!=hashIndex.end() ) { - return strcmp( c, s.c_str() )==0; + return &(*it); } - bool operator()( const std::string &s, const char *c ) const + else { - return strcmp( c, s.c_str() )==0; + lock.upgrade_to_writer(); + return &(*(hashSet->insert( std::string( value ) ).first ) ); } -}; - -} // namespace Detail +} -const std::string *InternedString::internedString( const char *value ) +const std::string *InternedString::internedString( const char *value, size_t length ) { Detail::HashSet *hashSet = Detail::hashSet(); Detail::Index &hashIndex = hashSet->get<0>(); Detail::Mutex::scoped_lock lock( *Detail::mutex(), false ); // read-only lock - Detail::HashSet::const_iterator it = hashIndex.find( value, Hash(), Detail::StringCStringEqual() ); + Detail::HashSet::const_iterator it = hashIndex.find( Detail::CharRange( value, value + length ) ); if( it!=hashIndex.end() ) { return &(*it); @@ -102,7 +184,7 @@ const std::string *InternedString::internedString( const char *value ) else { lock.upgrade_to_writer(); - return &(*(hashSet->insert( std::string( value ) ).first ) ); + return &(*(hashSet->insert( std::string( value, length ) ).first ) ); } } diff --git a/cortex-9.0.0-a6/src/IECore/InterpolatedCache.cpp b/cortex-9.0.0-a10/src/IECore/InterpolatedCache.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/InterpolatedCache.cpp rename to cortex-9.0.0-a10/src/IECore/InterpolatedCache.cpp diff --git a/cortex-9.0.0-a6/src/IECore/JPEGImageReader.cpp b/cortex-9.0.0-a10/src/IECore/JPEGImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/JPEGImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/JPEGImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/JPEGImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/JPEGImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/JPEGImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/JPEGImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LensDistortOp.cpp b/cortex-9.0.0-a10/src/IECore/LensDistortOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LensDistortOp.cpp rename to cortex-9.0.0-a10/src/IECore/LensDistortOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LensModel.cpp b/cortex-9.0.0-a10/src/IECore/LensModel.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LensModel.cpp rename to cortex-9.0.0-a10/src/IECore/LensModel.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LevelFilteredMessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/LevelFilteredMessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LevelFilteredMessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/LevelFilteredMessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Light.cpp b/cortex-9.0.0-a10/src/IECore/Light.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Light.cpp rename to cortex-9.0.0-a10/src/IECore/Light.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LimitSmoothSkinningInfluencesOp.cpp b/cortex-9.0.0-a10/src/IECore/LimitSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LimitSmoothSkinningInfluencesOp.cpp rename to cortex-9.0.0-a10/src/IECore/LimitSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinearToAlexaLogcOp.cpp b/cortex-9.0.0-a10/src/IECore/LinearToAlexaLogcOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinearToAlexaLogcOp.cpp rename to cortex-9.0.0-a10/src/IECore/LinearToAlexaLogcOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinearToCineonOp.cpp b/cortex-9.0.0-a10/src/IECore/LinearToCineonOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinearToCineonOp.cpp rename to cortex-9.0.0-a10/src/IECore/LinearToCineonOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinearToPanalogOp.cpp b/cortex-9.0.0-a10/src/IECore/LinearToPanalogOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinearToPanalogOp.cpp rename to cortex-9.0.0-a10/src/IECore/LinearToPanalogOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinearToRec709Op.cpp b/cortex-9.0.0-a10/src/IECore/LinearToRec709Op.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinearToRec709Op.cpp rename to cortex-9.0.0-a10/src/IECore/LinearToRec709Op.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinearToSRGBOp.cpp b/cortex-9.0.0-a10/src/IECore/LinearToSRGBOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinearToSRGBOp.cpp rename to cortex-9.0.0-a10/src/IECore/LinearToSRGBOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LinkedScene.cpp b/cortex-9.0.0-a10/src/IECore/LinkedScene.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LinkedScene.cpp rename to cortex-9.0.0-a10/src/IECore/LinkedScene.cpp diff --git a/cortex-9.0.0-a6/src/IECore/LuminanceOp.cpp b/cortex-9.0.0-a10/src/IECore/LuminanceOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/LuminanceOp.cpp rename to cortex-9.0.0-a10/src/IECore/LuminanceOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MPlayDisplayDriver.cpp b/cortex-9.0.0-a10/src/IECore/MPlayDisplayDriver.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MPlayDisplayDriver.cpp rename to cortex-9.0.0-a10/src/IECore/MPlayDisplayDriver.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MappedRandomPointDistributionOp.cpp b/cortex-9.0.0-a10/src/IECore/MappedRandomPointDistributionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MappedRandomPointDistributionOp.cpp rename to cortex-9.0.0-a10/src/IECore/MappedRandomPointDistributionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MarschnerLookupTableOp.cpp b/cortex-9.0.0-a10/src/IECore/MarschnerLookupTableOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MarschnerLookupTableOp.cpp rename to cortex-9.0.0-a10/src/IECore/MarschnerLookupTableOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MarschnerParameter.cpp b/cortex-9.0.0-a10/src/IECore/MarschnerParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MarschnerParameter.cpp rename to cortex-9.0.0-a10/src/IECore/MarschnerParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MatrixAlgo.cpp b/cortex-9.0.0-a10/src/IECore/MatrixAlgo.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MatrixAlgo.cpp rename to cortex-9.0.0-a10/src/IECore/MatrixAlgo.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MatrixMotionTransform.cpp b/cortex-9.0.0-a10/src/IECore/MatrixMotionTransform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MatrixMotionTransform.cpp rename to cortex-9.0.0-a10/src/IECore/MatrixMotionTransform.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MatrixMultiplyOp.cpp b/cortex-9.0.0-a10/src/IECore/MatrixMultiplyOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MatrixMultiplyOp.cpp rename to cortex-9.0.0-a10/src/IECore/MatrixMultiplyOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MatrixTransform.cpp b/cortex-9.0.0-a10/src/IECore/MatrixTransform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MatrixTransform.cpp rename to cortex-9.0.0-a10/src/IECore/MatrixTransform.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MedianCutSampler.cpp b/cortex-9.0.0-a10/src/IECore/MedianCutSampler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MedianCutSampler.cpp rename to cortex-9.0.0-a10/src/IECore/MedianCutSampler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MemoryIndexedIO.cpp b/cortex-9.0.0-a10/src/IECore/MemoryIndexedIO.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MemoryIndexedIO.cpp rename to cortex-9.0.0-a10/src/IECore/MemoryIndexedIO.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MemoryStream.cpp b/cortex-9.0.0-a10/src/IECore/MemoryStream.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MemoryStream.cpp rename to cortex-9.0.0-a10/src/IECore/MemoryStream.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshDistortionsOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshDistortionsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshDistortionsOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshDistortionsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshFaceFilterOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshFaceFilterOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshFaceFilterOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshFaceFilterOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshMergeOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshMergeOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshMergeOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshMergeOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshNormalsOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshNormalsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshNormalsOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshNormalsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/MeshPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/MeshPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshPrimitiveBuilder.cpp b/cortex-9.0.0-a10/src/IECore/MeshPrimitiveBuilder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshPrimitiveBuilder.cpp rename to cortex-9.0.0-a10/src/IECore/MeshPrimitiveBuilder.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshPrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/MeshPrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshPrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/MeshPrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshPrimitiveShrinkWrapOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshPrimitiveShrinkWrapOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshPrimitiveShrinkWrapOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshPrimitiveShrinkWrapOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshTangentsOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshTangentsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshTangentsOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshTangentsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MeshVertexReorderOp.cpp b/cortex-9.0.0-a10/src/IECore/MeshVertexReorderOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MeshVertexReorderOp.cpp rename to cortex-9.0.0-a10/src/IECore/MeshVertexReorderOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/MessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/MessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MixSmoothSkinningWeightsOp.cpp b/cortex-9.0.0-a10/src/IECore/MixSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MixSmoothSkinningWeightsOp.cpp rename to cortex-9.0.0-a10/src/IECore/MixSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ModifyOp.cpp b/cortex-9.0.0-a10/src/IECore/ModifyOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ModifyOp.cpp rename to cortex-9.0.0-a10/src/IECore/ModifyOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MotionBlock.cpp b/cortex-9.0.0-a10/src/IECore/MotionBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MotionBlock.cpp rename to cortex-9.0.0-a10/src/IECore/MotionBlock.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MotionPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/MotionPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MotionPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/MotionPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/MurmurHash.cpp b/cortex-9.0.0-a10/src/IECore/MurmurHash.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/MurmurHash.cpp rename to cortex-9.0.0-a10/src/IECore/MurmurHash.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NParticleReader.cpp b/cortex-9.0.0-a10/src/IECore/NParticleReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NParticleReader.cpp rename to cortex-9.0.0-a10/src/IECore/NParticleReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NURBSPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/NURBSPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NURBSPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/NURBSPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp b/cortex-9.0.0-a10/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp rename to cortex-9.0.0-a10/src/IECore/NormalizeSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NullMessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/NullMessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NullMessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/NullMessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NullObject.cpp b/cortex-9.0.0-a10/src/IECore/NullObject.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NullObject.cpp rename to cortex-9.0.0-a10/src/IECore/NullObject.cpp diff --git a/cortex-9.0.0-a6/src/IECore/NumericParameter.cpp b/cortex-9.0.0-a10/src/IECore/NumericParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/NumericParameter.cpp rename to cortex-9.0.0-a10/src/IECore/NumericParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/OBJReader.cpp b/cortex-9.0.0-a10/src/IECore/OBJReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/OBJReader.cpp rename to cortex-9.0.0-a10/src/IECore/OBJReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/OStreamMessageHandler.cpp b/cortex-9.0.0-a10/src/IECore/OStreamMessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/OStreamMessageHandler.cpp rename to cortex-9.0.0-a10/src/IECore/OStreamMessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Object.cpp b/cortex-9.0.0-a10/src/IECore/Object.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Object.cpp rename to cortex-9.0.0-a10/src/IECore/Object.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectInterpolator.cpp b/cortex-9.0.0-a10/src/IECore/ObjectInterpolator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectInterpolator.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectInterpolator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectParameter.cpp b/cortex-9.0.0-a10/src/IECore/ObjectParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectParameter.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectPool.cpp b/cortex-9.0.0-a10/src/IECore/ObjectPool.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectPool.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectPool.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectReader.cpp b/cortex-9.0.0-a10/src/IECore/ObjectReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectReader.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectVector.cpp b/cortex-9.0.0-a10/src/IECore/ObjectVector.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectVector.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectVector.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ObjectWriter.cpp b/cortex-9.0.0-a10/src/IECore/ObjectWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ObjectWriter.cpp rename to cortex-9.0.0-a10/src/IECore/ObjectWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Op.cpp b/cortex-9.0.0-a10/src/IECore/Op.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Op.cpp rename to cortex-9.0.0-a10/src/IECore/Op.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Options.cpp b/cortex-9.0.0-a10/src/IECore/Options.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Options.cpp rename to cortex-9.0.0-a10/src/IECore/Options.cpp diff --git a/cortex-9.0.0-a6/src/IECore/OversamplesCalculator.cpp b/cortex-9.0.0-a10/src/IECore/OversamplesCalculator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/OversamplesCalculator.cpp rename to cortex-9.0.0-a10/src/IECore/OversamplesCalculator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PDCParticleReader.cpp b/cortex-9.0.0-a10/src/IECore/PDCParticleReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PDCParticleReader.cpp rename to cortex-9.0.0-a10/src/IECore/PDCParticleReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PDCParticleWriter.cpp b/cortex-9.0.0-a10/src/IECore/PDCParticleWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PDCParticleWriter.cpp rename to cortex-9.0.0-a10/src/IECore/PDCParticleWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PNGImageReader.cpp b/cortex-9.0.0-a10/src/IECore/PNGImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PNGImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/PNGImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PanalogToLinearOp.cpp b/cortex-9.0.0-a10/src/IECore/PanalogToLinearOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PanalogToLinearOp.cpp rename to cortex-9.0.0-a10/src/IECore/PanalogToLinearOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Parameter.cpp b/cortex-9.0.0-a10/src/IECore/Parameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Parameter.cpp rename to cortex-9.0.0-a10/src/IECore/Parameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Parameterised.cpp b/cortex-9.0.0-a10/src/IECore/Parameterised.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Parameterised.cpp rename to cortex-9.0.0-a10/src/IECore/Parameterised.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ParameterisedInterface.cpp b/cortex-9.0.0-a10/src/IECore/ParameterisedInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ParameterisedInterface.cpp rename to cortex-9.0.0-a10/src/IECore/ParameterisedInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ParameterisedProcedural.cpp b/cortex-9.0.0-a10/src/IECore/ParameterisedProcedural.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ParameterisedProcedural.cpp rename to cortex-9.0.0-a10/src/IECore/ParameterisedProcedural.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ParticleReader.cpp b/cortex-9.0.0-a10/src/IECore/ParticleReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ParticleReader.cpp rename to cortex-9.0.0-a10/src/IECore/ParticleReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ParticleWriter.cpp b/cortex-9.0.0-a10/src/IECore/ParticleWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ParticleWriter.cpp rename to cortex-9.0.0-a10/src/IECore/ParticleWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PatchMeshPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/PatchMeshPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PatchMeshPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/PatchMeshPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PathParameter.cpp b/cortex-9.0.0-a10/src/IECore/PathParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PathParameter.cpp rename to cortex-9.0.0-a10/src/IECore/PathParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PathVectorParameter.cpp b/cortex-9.0.0-a10/src/IECore/PathVectorParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PathVectorParameter.cpp rename to cortex-9.0.0-a10/src/IECore/PathVectorParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointBoundsOp.cpp b/cortex-9.0.0-a10/src/IECore/PointBoundsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointBoundsOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointBoundsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointDensitiesOp.cpp b/cortex-9.0.0-a10/src/IECore/PointDensitiesOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointDensitiesOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointDensitiesOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointDistribution.cpp b/cortex-9.0.0-a10/src/IECore/PointDistribution.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointDistribution.cpp rename to cortex-9.0.0-a10/src/IECore/PointDistribution.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointDistributionOp.cpp b/cortex-9.0.0-a10/src/IECore/PointDistributionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointDistributionOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointDistributionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointNormalsOp.cpp b/cortex-9.0.0-a10/src/IECore/PointNormalsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointNormalsOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointNormalsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointRepulsionOp.cpp b/cortex-9.0.0-a10/src/IECore/PointRepulsionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointRepulsionOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointRepulsionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointSmoothSkinningOp.cpp b/cortex-9.0.0-a10/src/IECore/PointSmoothSkinningOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointSmoothSkinningOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointSmoothSkinningOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointVelocityDisplaceOp.cpp b/cortex-9.0.0-a10/src/IECore/PointVelocityDisplaceOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointVelocityDisplaceOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointVelocityDisplaceOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointsMotionOp.cpp b/cortex-9.0.0-a10/src/IECore/PointsMotionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointsMotionOp.cpp rename to cortex-9.0.0-a10/src/IECore/PointsMotionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointsPrimitive.cpp b/cortex-9.0.0-a10/src/IECore/PointsPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointsPrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/PointsPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PointsPrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/PointsPrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PointsPrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/PointsPrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PreWorldRenderable.cpp b/cortex-9.0.0-a10/src/IECore/PreWorldRenderable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PreWorldRenderable.cpp rename to cortex-9.0.0-a10/src/IECore/PreWorldRenderable.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Primitive.cpp b/cortex-9.0.0-a10/src/IECore/Primitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Primitive.cpp rename to cortex-9.0.0-a10/src/IECore/Primitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/PrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/PrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PrimitiveOp.cpp b/cortex-9.0.0-a10/src/IECore/PrimitiveOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PrimitiveOp.cpp rename to cortex-9.0.0-a10/src/IECore/PrimitiveOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/PrimitiveVariable.cpp b/cortex-9.0.0-a10/src/IECore/PrimitiveVariable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/PrimitiveVariable.cpp rename to cortex-9.0.0-a10/src/IECore/PrimitiveVariable.cpp diff --git a/cortex-9.0.0-a6/src/IECore/RadixSort.cpp b/cortex-9.0.0-a10/src/IECore/RadixSort.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/RadixSort.cpp rename to cortex-9.0.0-a10/src/IECore/RadixSort.cpp diff --git a/cortex-9.0.0-a6/src/IECore/RandomRotationOp.cpp b/cortex-9.0.0-a10/src/IECore/RandomRotationOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/RandomRotationOp.cpp rename to cortex-9.0.0-a10/src/IECore/RandomRotationOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Reader.cpp b/cortex-9.0.0-a10/src/IECore/Reader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Reader.cpp rename to cortex-9.0.0-a10/src/IECore/Reader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Rec709ToLinearOp.cpp b/cortex-9.0.0-a10/src/IECore/Rec709ToLinearOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Rec709ToLinearOp.cpp rename to cortex-9.0.0-a10/src/IECore/Rec709ToLinearOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/RefCounted.cpp b/cortex-9.0.0-a10/src/IECore/RefCounted.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/RefCounted.cpp rename to cortex-9.0.0-a10/src/IECore/RefCounted.cpp diff --git a/cortex-9.0.0-a6/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp b/cortex-9.0.0-a10/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp rename to cortex-9.0.0-a10/src/IECore/RemoveSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Renderable.cpp b/cortex-9.0.0-a10/src/IECore/Renderable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Renderable.cpp rename to cortex-9.0.0-a10/src/IECore/Renderable.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Renderer.cpp b/cortex-9.0.0-a10/src/IECore/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Renderer.cpp rename to cortex-9.0.0-a10/src/IECore/Renderer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp b/cortex-9.0.0-a10/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp rename to cortex-9.0.0-a10/src/IECore/ReorderSmoothSkinningInfluencesOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ReorderedFrameList.cpp b/cortex-9.0.0-a10/src/IECore/ReorderedFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ReorderedFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/ReorderedFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ReversedFrameList.cpp b/cortex-9.0.0-a10/src/IECore/ReversedFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ReversedFrameList.cpp rename to cortex-9.0.0-a10/src/IECore/ReversedFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECore/RunTimeTyped.cpp b/cortex-9.0.0-a10/src/IECore/RunTimeTyped.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/RunTimeTyped.cpp rename to cortex-9.0.0-a10/src/IECore/RunTimeTyped.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SGIImageReader.cpp b/cortex-9.0.0-a10/src/IECore/SGIImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SGIImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/SGIImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SRGBToLinearOp.cpp b/cortex-9.0.0-a10/src/IECore/SRGBToLinearOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SRGBToLinearOp.cpp rename to cortex-9.0.0-a10/src/IECore/SRGBToLinearOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SampledSceneInterface.cpp b/cortex-9.0.0-a10/src/IECore/SampledSceneInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SampledSceneInterface.cpp rename to cortex-9.0.0-a10/src/IECore/SampledSceneInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SceneCache.cpp b/cortex-9.0.0-a10/src/IECore/SceneCache.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SceneCache.cpp rename to cortex-9.0.0-a10/src/IECore/SceneCache.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SceneInterface.cpp b/cortex-9.0.0-a10/src/IECore/SceneInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SceneInterface.cpp rename to cortex-9.0.0-a10/src/IECore/SceneInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ScopedTIFFErrorHandler.cpp b/cortex-9.0.0-a10/src/IECore/ScopedTIFFErrorHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ScopedTIFFErrorHandler.cpp rename to cortex-9.0.0-a10/src/IECore/ScopedTIFFErrorHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SearchPath.cpp b/cortex-9.0.0-a10/src/IECore/SearchPath.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SearchPath.cpp rename to cortex-9.0.0-a10/src/IECore/SearchPath.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Shader.cpp b/cortex-9.0.0-a10/src/IECore/Shader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Shader.cpp rename to cortex-9.0.0-a10/src/IECore/Shader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SharedSceneInterfaces.cpp b/cortex-9.0.0-a10/src/IECore/SharedSceneInterfaces.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SharedSceneInterfaces.cpp rename to cortex-9.0.0-a10/src/IECore/SharedSceneInterfaces.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SimpleSubsurface.cpp b/cortex-9.0.0-a10/src/IECore/SimpleSubsurface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SimpleSubsurface.cpp rename to cortex-9.0.0-a10/src/IECore/SimpleSubsurface.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SimpleTypedData.cpp b/cortex-9.0.0-a10/src/IECore/SimpleTypedData.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECore/SimpleTypedData.cpp rename to cortex-9.0.0-a10/src/IECore/SimpleTypedData.cpp index c7ae6b3d81..33d9eb5129 100644 --- a/cortex-9.0.0-a6/src/IECore/SimpleTypedData.cpp +++ b/cortex-9.0.0-a10/src/IECore/SimpleTypedData.cpp @@ -145,7 +145,7 @@ template<> void StringData::memoryUsage( Object::MemoryAccumulator &accumulator ) const { Data::memoryUsage( accumulator ); - accumulator.accumulate( &readable(), readable().capacity() ); + accumulator.accumulate( readable().capacity() ); } template<> diff --git a/cortex-9.0.0-a6/src/IECore/SimpleTypedParameter.cpp b/cortex-9.0.0-a10/src/IECore/SimpleTypedParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SimpleTypedParameter.cpp rename to cortex-9.0.0-a10/src/IECore/SimpleTypedParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SmoothSkinningData.cpp b/cortex-9.0.0-a10/src/IECore/SmoothSkinningData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SmoothSkinningData.cpp rename to cortex-9.0.0-a10/src/IECore/SmoothSkinningData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SmoothSmoothSkinningWeightsOp.cpp b/cortex-9.0.0-a10/src/IECore/SmoothSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SmoothSmoothSkinningWeightsOp.cpp rename to cortex-9.0.0-a10/src/IECore/SmoothSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SpherePrimitive.cpp b/cortex-9.0.0-a10/src/IECore/SpherePrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SpherePrimitive.cpp rename to cortex-9.0.0-a10/src/IECore/SpherePrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SpherePrimitiveEvaluator.cpp b/cortex-9.0.0-a10/src/IECore/SpherePrimitiveEvaluator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SpherePrimitiveEvaluator.cpp rename to cortex-9.0.0-a10/src/IECore/SpherePrimitiveEvaluator.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SphericalHarmonics.cpp b/cortex-9.0.0-a10/src/IECore/SphericalHarmonics.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SphericalHarmonics.cpp rename to cortex-9.0.0-a10/src/IECore/SphericalHarmonics.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SphericalHarmonicsProjector.cpp b/cortex-9.0.0-a10/src/IECore/SphericalHarmonicsProjector.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SphericalHarmonicsProjector.cpp rename to cortex-9.0.0-a10/src/IECore/SphericalHarmonicsProjector.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SphericalHarmonicsRotationMatrix.cpp b/cortex-9.0.0-a10/src/IECore/SphericalHarmonicsRotationMatrix.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SphericalHarmonicsRotationMatrix.cpp rename to cortex-9.0.0-a10/src/IECore/SphericalHarmonicsRotationMatrix.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SphericalHarmonicsTensor.cpp b/cortex-9.0.0-a10/src/IECore/SphericalHarmonicsTensor.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SphericalHarmonicsTensor.cpp rename to cortex-9.0.0-a10/src/IECore/SphericalHarmonicsTensor.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SphericalHarmonicsTransferMatrix.cpp b/cortex-9.0.0-a10/src/IECore/SphericalHarmonicsTransferMatrix.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SphericalHarmonicsTransferMatrix.cpp rename to cortex-9.0.0-a10/src/IECore/SphericalHarmonicsTransferMatrix.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SplineData.cpp b/cortex-9.0.0-a10/src/IECore/SplineData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SplineData.cpp rename to cortex-9.0.0-a10/src/IECore/SplineData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SplineParameter.cpp b/cortex-9.0.0-a10/src/IECore/SplineParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SplineParameter.cpp rename to cortex-9.0.0-a10/src/IECore/SplineParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SplineToImage.cpp b/cortex-9.0.0-a10/src/IECore/SplineToImage.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SplineToImage.cpp rename to cortex-9.0.0-a10/src/IECore/SplineToImage.cpp diff --git a/cortex-9.0.0-a6/src/IECore/StandardRadialLensModel.cpp b/cortex-9.0.0-a10/src/IECore/StandardRadialLensModel.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/StandardRadialLensModel.cpp rename to cortex-9.0.0-a10/src/IECore/StandardRadialLensModel.cpp diff --git a/cortex-9.0.0-a6/src/IECore/StateRenderable.cpp b/cortex-9.0.0-a10/src/IECore/StateRenderable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/StateRenderable.cpp rename to cortex-9.0.0-a10/src/IECore/StateRenderable.cpp diff --git a/cortex-9.0.0-a6/src/IECore/StreamIndexedIO.cpp b/cortex-9.0.0-a10/src/IECore/StreamIndexedIO.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/StreamIndexedIO.cpp rename to cortex-9.0.0-a10/src/IECore/StreamIndexedIO.cpp diff --git a/cortex-9.0.0-a6/src/IECore/SummedAreaOp.cpp b/cortex-9.0.0-a10/src/IECore/SummedAreaOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/SummedAreaOp.cpp rename to cortex-9.0.0-a10/src/IECore/SummedAreaOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TGAImageReader.cpp b/cortex-9.0.0-a10/src/IECore/TGAImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TGAImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/TGAImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TGAImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/TGAImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TGAImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/TGAImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TIFFImageReader.cpp b/cortex-9.0.0-a10/src/IECore/TIFFImageReader.cpp similarity index 96% rename from cortex-9.0.0-a6/src/IECore/TIFFImageReader.cpp rename to cortex-9.0.0-a10/src/IECore/TIFFImageReader.cpp index eb02116d64..93f167fd5c 100644 --- a/cortex-9.0.0-a6/src/IECore/TIFFImageReader.cpp +++ b/cortex-9.0.0-a10/src/IECore/TIFFImageReader.cpp @@ -52,6 +52,7 @@ #include "boost/static_assert.hpp" #include "boost/format.hpp" +#include "boost/algorithm/string/predicate.hpp" #include "tiffio.h" @@ -206,6 +207,24 @@ Imath::Box2i TIFFImageReader::displayWindow() std::string TIFFImageReader::sourceColorSpace() const { readCurrentDirectory( true ); + + // Handle 3delight tdls specially - they store the sourceColorSpace in the imageDescription + if( boost::starts_with( m_software, "tdlmake" ) ) + { + if( m_imageDescription.find( "InputSpace:BT.709" ) != std::string::npos ) + { + return "rec709"; + } + else if( m_imageDescription.find( "InputSpace:sRGB" ) != std::string::npos ) + { + return "srgb"; + } + else + { + return "linear"; + } + } + if ( m_sampleFormat == SAMPLEFORMAT_IEEEFP ) { // Usually the tiffs are in linear colorspace if the channels are float. @@ -648,6 +667,11 @@ bool TIFFImageReader::readCurrentDirectory( bool throwOnFailure ) throw IOException( ( boost::format("TIFFImageReader: Unsupported value (%d) for TIFFTAG_PLANARCONFIG") % m_orientation ).str() ); } + // The pointer returned by TIFFGetField will be invalidated if we change the directory index. + // Copy it to a string to be safe + m_software = std::string( tiffField( TIFFTAG_SOFTWARE, "" ) ); + m_imageDescription = std::string( tiffField( TIFFTAG_IMAGEDESCRIPTION, "" ) ); + uint16 numExtraSamples; uint16 *extraSamples; TIFFGetFieldDefaulted( m_tiffImage, TIFFTAG_EXTRASAMPLES, &numExtraSamples, &extraSamples); diff --git a/cortex-9.0.0-a6/src/IECore/TIFFImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/TIFFImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TIFFImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/TIFFImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimeCodeData.cpp b/cortex-9.0.0-a10/src/IECore/TimeCodeData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimeCodeData.cpp rename to cortex-9.0.0-a10/src/IECore/TimeCodeData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimeCodeParameter.cpp b/cortex-9.0.0-a10/src/IECore/TimeCodeParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimeCodeParameter.cpp rename to cortex-9.0.0-a10/src/IECore/TimeCodeParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimeDurationData.cpp b/cortex-9.0.0-a10/src/IECore/TimeDurationData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimeDurationData.cpp rename to cortex-9.0.0-a10/src/IECore/TimeDurationData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimeDurationParameter.cpp b/cortex-9.0.0-a10/src/IECore/TimeDurationParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimeDurationParameter.cpp rename to cortex-9.0.0-a10/src/IECore/TimeDurationParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimePeriod.cpp b/cortex-9.0.0-a10/src/IECore/TimePeriod.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimePeriod.cpp rename to cortex-9.0.0-a10/src/IECore/TimePeriod.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimePeriodData.cpp b/cortex-9.0.0-a10/src/IECore/TimePeriodData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimePeriodData.cpp rename to cortex-9.0.0-a10/src/IECore/TimePeriodData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TimePeriodParameter.cpp b/cortex-9.0.0-a10/src/IECore/TimePeriodParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TimePeriodParameter.cpp rename to cortex-9.0.0-a10/src/IECore/TimePeriodParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Timer.cpp b/cortex-9.0.0-a10/src/IECore/Timer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Timer.cpp rename to cortex-9.0.0-a10/src/IECore/Timer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ToCoreConverter.cpp b/cortex-9.0.0-a10/src/IECore/ToCoreConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ToCoreConverter.cpp rename to cortex-9.0.0-a10/src/IECore/ToCoreConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TransferSmoothSkinningWeightsOp.cpp b/cortex-9.0.0-a10/src/IECore/TransferSmoothSkinningWeightsOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TransferSmoothSkinningWeightsOp.cpp rename to cortex-9.0.0-a10/src/IECore/TransferSmoothSkinningWeightsOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Transform.cpp b/cortex-9.0.0-a10/src/IECore/Transform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Transform.cpp rename to cortex-9.0.0-a10/src/IECore/Transform.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TransformBlock.cpp b/cortex-9.0.0-a10/src/IECore/TransformBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TransformBlock.cpp rename to cortex-9.0.0-a10/src/IECore/TransformBlock.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TransformOp.cpp b/cortex-9.0.0-a10/src/IECore/TransformOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TransformOp.cpp rename to cortex-9.0.0-a10/src/IECore/TransformOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TransformationMatrix.cpp b/cortex-9.0.0-a10/src/IECore/TransformationMatrix.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TransformationMatrix.cpp rename to cortex-9.0.0-a10/src/IECore/TransformationMatrix.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TransformationMatrixData.cpp b/cortex-9.0.0-a10/src/IECore/TransformationMatrixData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TransformationMatrixData.cpp rename to cortex-9.0.0-a10/src/IECore/TransformationMatrixData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TriangulateOp.cpp b/cortex-9.0.0-a10/src/IECore/TriangulateOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TriangulateOp.cpp rename to cortex-9.0.0-a10/src/IECore/TriangulateOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TypedObjectParameter.cpp b/cortex-9.0.0-a10/src/IECore/TypedObjectParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TypedObjectParameter.cpp rename to cortex-9.0.0-a10/src/IECore/TypedObjectParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TypedPrimitiveOp.cpp b/cortex-9.0.0-a10/src/IECore/TypedPrimitiveOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TypedPrimitiveOp.cpp rename to cortex-9.0.0-a10/src/IECore/TypedPrimitiveOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/TypedPrimitiveParameter.cpp b/cortex-9.0.0-a10/src/IECore/TypedPrimitiveParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/TypedPrimitiveParameter.cpp rename to cortex-9.0.0-a10/src/IECore/TypedPrimitiveParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/UVDistortOp.cpp b/cortex-9.0.0-a10/src/IECore/UVDistortOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/UVDistortOp.cpp rename to cortex-9.0.0-a10/src/IECore/UVDistortOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/UniformRandomPointDistributionOp.cpp b/cortex-9.0.0-a10/src/IECore/UniformRandomPointDistributionOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/UniformRandomPointDistributionOp.cpp rename to cortex-9.0.0-a10/src/IECore/UniformRandomPointDistributionOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/ValidatedStringParameter.cpp b/cortex-9.0.0-a10/src/IECore/ValidatedStringParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/ValidatedStringParameter.cpp rename to cortex-9.0.0-a10/src/IECore/ValidatedStringParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/VectorDataFilterOp.cpp b/cortex-9.0.0-a10/src/IECore/VectorDataFilterOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/VectorDataFilterOp.cpp rename to cortex-9.0.0-a10/src/IECore/VectorDataFilterOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/VectorTypedData.cpp b/cortex-9.0.0-a10/src/IECore/VectorTypedData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/VectorTypedData.cpp rename to cortex-9.0.0-a10/src/IECore/VectorTypedData.cpp diff --git a/cortex-9.0.0-a6/src/IECore/VectorTypedParameter.cpp b/cortex-9.0.0-a10/src/IECore/VectorTypedParameter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/VectorTypedParameter.cpp rename to cortex-9.0.0-a10/src/IECore/VectorTypedParameter.cpp diff --git a/cortex-9.0.0-a6/src/IECore/VisibleRenderable.cpp b/cortex-9.0.0-a10/src/IECore/VisibleRenderable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/VisibleRenderable.cpp rename to cortex-9.0.0-a10/src/IECore/VisibleRenderable.cpp diff --git a/cortex-9.0.0-a6/src/IECore/WarpOp.cpp b/cortex-9.0.0-a10/src/IECore/WarpOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/WarpOp.cpp rename to cortex-9.0.0-a10/src/IECore/WarpOp.cpp diff --git a/cortex-9.0.0-a6/src/IECore/WorldBlock.cpp b/cortex-9.0.0-a10/src/IECore/WorldBlock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/WorldBlock.cpp rename to cortex-9.0.0-a10/src/IECore/WorldBlock.cpp diff --git a/cortex-9.0.0-a6/src/IECore/Writer.cpp b/cortex-9.0.0-a10/src/IECore/Writer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/Writer.cpp rename to cortex-9.0.0-a10/src/IECore/Writer.cpp diff --git a/cortex-9.0.0-a6/src/IECore/YUVImageWriter.cpp b/cortex-9.0.0-a10/src/IECore/YUVImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECore/YUVImageWriter.cpp rename to cortex-9.0.0-a10/src/IECore/YUVImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/AlphaTexture.cpp b/cortex-9.0.0-a10/src/IECoreGL/AlphaTexture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/AlphaTexture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/AlphaTexture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Bindable.cpp b/cortex-9.0.0-a10/src/IECoreGL/Bindable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Bindable.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Bindable.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/BoxPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/BoxPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/BoxPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/BoxPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Buffer.cpp b/cortex-9.0.0-a10/src/IECoreGL/Buffer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Buffer.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Buffer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/CachedConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/CachedConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/CachedConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/CachedConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Camera.cpp b/cortex-9.0.0-a10/src/IECoreGL/Camera.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Camera.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Camera.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ColorTexture.cpp b/cortex-9.0.0-a10/src/IECoreGL/ColorTexture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ColorTexture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ColorTexture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/CurvesPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/CurvesPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/CurvesPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/CurvesPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Debug.cpp b/cortex-9.0.0-a10/src/IECoreGL/Debug.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Debug.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Debug.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/DeferredRendererImplementation.cpp b/cortex-9.0.0-a10/src/IECoreGL/DeferredRendererImplementation.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/DeferredRendererImplementation.cpp rename to cortex-9.0.0-a10/src/IECoreGL/DeferredRendererImplementation.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/DepthTexture.cpp b/cortex-9.0.0-a10/src/IECoreGL/DepthTexture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/DepthTexture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/DepthTexture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/DiskPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/DiskPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/DiskPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/DiskPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Display.cpp b/cortex-9.0.0-a10/src/IECoreGL/Display.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Display.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Display.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Exception.cpp b/cortex-9.0.0-a10/src/IECoreGL/Exception.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Exception.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Exception.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Font.cpp b/cortex-9.0.0-a10/src/IECoreGL/Font.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Font.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Font.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/FontLoader.cpp b/cortex-9.0.0-a10/src/IECoreGL/FontLoader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/FontLoader.cpp rename to cortex-9.0.0-a10/src/IECoreGL/FontLoader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/FrameBuffer.cpp b/cortex-9.0.0-a10/src/IECoreGL/FrameBuffer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/FrameBuffer.cpp rename to cortex-9.0.0-a10/src/IECoreGL/FrameBuffer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Group.cpp b/cortex-9.0.0-a10/src/IECoreGL/Group.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Group.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Group.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/HitRecord.cpp b/cortex-9.0.0-a10/src/IECoreGL/HitRecord.cpp similarity index 92% rename from cortex-9.0.0-a6/src/IECoreGL/HitRecord.cpp rename to cortex-9.0.0-a10/src/IECoreGL/HitRecord.cpp index 3d092b0271..dcf11bb1b1 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/HitRecord.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/HitRecord.cpp @@ -46,7 +46,7 @@ using namespace IECoreGL; HitRecord::HitRecord( const GLuint *hitRecord ) : depthMin( (float)hitRecord[1]/(float)Imath::limits::max() ), depthMax( (float)hitRecord[2]/(float)Imath::limits::max() ), - name( NameStateComponent::nameFromGLName( hitRecord[3] ) ) + name( hitRecord[3] ) { if( hitRecord[0] != 1 ) @@ -55,8 +55,8 @@ HitRecord::HitRecord( const GLuint *hitRecord ) } } -HitRecord::HitRecord( float dMin, float dMax, const IECore::InternedString &primName ) - : depthMin( dMin ), depthMax( dMax ), name( primName ) +HitRecord::HitRecord( float dMin, float dMax, GLuint name ) + : depthMin( dMin ), depthMax( dMax ), name( name ) { } diff --git a/cortex-9.0.0-a6/src/IECoreGL/IECoreGL.cpp b/cortex-9.0.0-a10/src/IECoreGL/IECoreGL.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/IECoreGL.cpp rename to cortex-9.0.0-a10/src/IECoreGL/IECoreGL.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ImmediateRendererImplementation.cpp b/cortex-9.0.0-a10/src/IECoreGL/ImmediateRendererImplementation.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ImmediateRendererImplementation.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ImmediateRendererImplementation.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/LuminanceTexture.cpp b/cortex-9.0.0-a10/src/IECoreGL/LuminanceTexture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/LuminanceTexture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/LuminanceTexture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/MeshPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/MeshPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/MeshPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/MeshPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/NameStateComponent.cpp b/cortex-9.0.0-a10/src/IECoreGL/NameStateComponent.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/NameStateComponent.cpp rename to cortex-9.0.0-a10/src/IECoreGL/NameStateComponent.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/NumericTraits.cpp b/cortex-9.0.0-a10/src/IECoreGL/NumericTraits.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/NumericTraits.cpp rename to cortex-9.0.0-a10/src/IECoreGL/NumericTraits.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/OrthographicCamera.cpp b/cortex-9.0.0-a10/src/IECoreGL/OrthographicCamera.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/OrthographicCamera.cpp rename to cortex-9.0.0-a10/src/IECoreGL/OrthographicCamera.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/PerspectiveCamera.cpp b/cortex-9.0.0-a10/src/IECoreGL/PerspectiveCamera.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/PerspectiveCamera.cpp rename to cortex-9.0.0-a10/src/IECoreGL/PerspectiveCamera.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/PointsPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/PointsPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/PointsPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/PointsPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Primitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/Primitive.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECoreGL/Primitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Primitive.cpp index 05f7054b65..1c61bbdfd4 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/Primitive.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/Primitive.cpp @@ -45,7 +45,6 @@ #include "IECoreGL/TypedStateComponent.h" #include "IECoreGL/ShaderStateComponent.h" #include "IECoreGL/Shader.h" -#include "IECoreGL/TextureUnits.h" #include "IECoreGL/NumericTraits.h" #include "IECoreGL/UniformFunctions.h" #include "IECoreGL/CachedConverter.h" diff --git a/cortex-9.0.0-a6/src/IECoreGL/QuadPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/QuadPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/QuadPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/QuadPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Renderable.cpp b/cortex-9.0.0-a10/src/IECoreGL/Renderable.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Renderable.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Renderable.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Renderer.cpp b/cortex-9.0.0-a10/src/IECoreGL/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Renderer.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Renderer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/RendererImplementation.cpp b/cortex-9.0.0-a10/src/IECoreGL/RendererImplementation.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/RendererImplementation.cpp rename to cortex-9.0.0-a10/src/IECoreGL/RendererImplementation.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Scene.cpp b/cortex-9.0.0-a10/src/IECoreGL/Scene.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Scene.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Scene.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/Selector.cpp b/cortex-9.0.0-a10/src/IECoreGL/Selector.cpp similarity index 97% rename from cortex-9.0.0-a6/src/IECoreGL/Selector.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Selector.cpp index 39b27dcf88..b5b295f151 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/Selector.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/Selector.cpp @@ -66,7 +66,7 @@ class Selector::Implementation : public IECore::RefCounted public : Implementation( Selector *parent, const Imath::Box2f ®ion, Mode mode, std::vector &hits ) - : m_mode( mode ), m_hits( hits ), m_baseState( new State( true /* complete */ ) ), m_currentName( 0 ), m_currentIDShader( NULL ) + : m_mode( mode ), m_hits( hits ), m_baseState( new State( true /* complete */ ) ), m_currentName( 0 ), m_nextGeneratedName( 1 ), m_currentIDShader( NULL ) { // we don't want preexisting errors to trigger exceptions // from error checking code in the begin*() methods, because @@ -190,6 +190,13 @@ class Selector::Implementation : public IECore::RefCounted m_currentName = name; } + GLuint loadName() + { + const GLuint name = m_nextGeneratedName++; + loadName( name ); + return name; + } + State *baseState() { return m_baseState.get(); @@ -256,6 +263,7 @@ class Selector::Implementation : public IECore::RefCounted std::vector &m_hits; StatePtr m_baseState; GLuint m_currentName; + GLuint m_nextGeneratedName; static Selector *g_currentSelector; @@ -398,7 +406,7 @@ class Selector::Implementation : public IECore::RefCounted std::map::iterator it = idRecords.find( ids[i] ); if( it == idRecords.end() ) { - HitRecord r( Imath::limits::max(), Imath::limits::min(), NameStateComponent::nameFromGLName( ids[i] ) ); + HitRecord r( Imath::limits::max(), Imath::limits::min(), ids[i] ); it = idRecords.insert( std::pair( ids[i], r ) ).first; } it->second.depthMin = std::min( it->second.depthMin, z[i] ); @@ -461,7 +469,7 @@ class Selector::Implementation : public IECore::RefCounted glGetQueryObjectuivARB( m_queries[i], GL_QUERY_RESULT_ARB, &samplesPassed ); if( samplesPassed ) { - m_hits.push_back( HitRecord( 0, 0, NameStateComponent::nameFromGLName( m_queryNames[i] ) ) ); + m_hits.push_back( HitRecord( 0, 0, m_queryNames[i] ) ); } } @@ -501,6 +509,11 @@ void Selector::loadName( GLuint name ) m_implementation->loadName( name ); } +GLuint Selector::loadName() +{ + return m_implementation->loadName(); +} + State *Selector::baseState() { return m_implementation->baseState(); diff --git a/cortex-9.0.0-a6/src/IECoreGL/Shader.cpp b/cortex-9.0.0-a10/src/IECoreGL/Shader.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECoreGL/Shader.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Shader.cpp index 594a61b531..9878f2578d 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/Shader.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/Shader.cpp @@ -51,7 +51,6 @@ #include "IECoreGL/Buffer.h" #include "IECoreGL/NumericTraits.h" #include "IECoreGL/CachedConverter.h" -#include "IECoreGL/TextureUnits.h" #include "IECoreGL/Selector.h" using namespace std; @@ -517,7 +516,7 @@ class Shader::Setup::MemberData : public IECore::RefCounted virtual void bind() { - glActiveTexture( textureUnits()[m_textureUnit] ); + glActiveTexture( GL_TEXTURE0 + m_textureUnit ); glGetIntegerv( GL_TEXTURE_BINDING_2D, &m_previousTexture ); if( m_texture ) { @@ -532,7 +531,7 @@ class Shader::Setup::MemberData : public IECore::RefCounted virtual void unbind() { - glActiveTexture( textureUnits()[m_textureUnit] ); + glActiveTexture( GL_TEXTURE0 + m_textureUnit ); glBindTexture( GL_TEXTURE_2D, m_previousTexture ); } diff --git a/cortex-9.0.0-a6/src/IECoreGL/ShaderLoader.cpp b/cortex-9.0.0-a10/src/IECoreGL/ShaderLoader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ShaderLoader.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ShaderLoader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ShaderStateComponent.cpp b/cortex-9.0.0-a10/src/IECoreGL/ShaderStateComponent.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECoreGL/ShaderStateComponent.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ShaderStateComponent.cpp index d8a8052d85..a6342b2143 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/ShaderStateComponent.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/ShaderStateComponent.cpp @@ -92,6 +92,10 @@ class ShaderStateComponent::Implementation : public IECore::RefCounted void addParametersToShaderSetup( Shader::Setup *shaderSetup ) const { + if( !m_parameterMap ) + { + return; + } const IECore::CompoundObject::ObjectMap &d = m_parameterMap->members(); for( IECore::CompoundObject::ObjectMap::const_iterator it = d.begin(), eIt = d.end(); it != eIt; it++ ) { diff --git a/cortex-9.0.0-a6/src/IECoreGL/SpherePrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/SpherePrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/SpherePrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/SpherePrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/SplineToGLTextureConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/SplineToGLTextureConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/SplineToGLTextureConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/SplineToGLTextureConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/State.cpp b/cortex-9.0.0-a10/src/IECoreGL/State.cpp similarity index 96% rename from cortex-9.0.0-a6/src/IECoreGL/State.cpp rename to cortex-9.0.0-a10/src/IECoreGL/State.cpp index e1bab2d86c..efaffee93c 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/State.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/State.cpp @@ -186,6 +186,22 @@ class State::Implementation : public IECore::RefCounted State::ScopedBinding::ScopedBinding( const State &s, State ¤tState ) : m_currentState( currentState ) { + init( s ); +} + +State::ScopedBinding::ScopedBinding( const State &s, State ¤tState, bool bind ) + : m_currentState( currentState ) +{ + init( s, bind ); +} + +void State::ScopedBinding::init( const State &s, bool bind ) +{ + if( !bind ) + { + return; + } + m_savedComponents.reserve( s.m_implementation->m_components.size() ); for( Implementation::ComponentMap::const_iterator it=s.m_implementation->m_components.begin(); it!=s.m_implementation->m_components.end(); it++ ) diff --git a/cortex-9.0.0-a6/src/IECoreGL/StateComponent.cpp b/cortex-9.0.0-a10/src/IECoreGL/StateComponent.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/StateComponent.cpp rename to cortex-9.0.0-a10/src/IECoreGL/StateComponent.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/TextPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreGL/TextPrimitive.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECoreGL/TextPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreGL/TextPrimitive.cpp index a62935f802..d414ab0fe8 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/TextPrimitive.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/TextPrimitive.cpp @@ -38,7 +38,6 @@ #include "IECoreGL/State.h" #include "IECoreGL/Font.h" #include "IECoreGL/GL.h" -#include "IECoreGL/TextureUnits.h" using namespace IECoreGL; using namespace Imath; @@ -140,7 +139,7 @@ void TextPrimitive::renderSprites( State *state ) const glEnable( GL_TEXTURE_2D ); glDisable( GL_LIGHTING ); /// \todo Perhaps we could support lighting even in this mode? - glActiveTexture( textureUnits()[0] ); + glActiveTexture( GL_TEXTURE0 ); m_font->texture()->bind(); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); diff --git a/cortex-9.0.0-a6/src/IECoreGL/Texture.cpp b/cortex-9.0.0-a10/src/IECoreGL/Texture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/Texture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/Texture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/TextureLoader.cpp b/cortex-9.0.0-a10/src/IECoreGL/TextureLoader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/TextureLoader.cpp rename to cortex-9.0.0-a10/src/IECoreGL/TextureLoader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLBufferConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLBufferConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLBufferConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLBufferConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLCameraConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLCameraConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLCameraConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLCameraConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLCurvesConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLCurvesConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLCurvesConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLCurvesConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLMeshConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLMeshConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLMeshConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLMeshConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLPointsConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLPointsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLPointsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLPointsConverter.cpp diff --git a/cortex-9.0.0-a10/src/IECoreGL/ToGLStateConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLStateConverter.cpp new file mode 100644 index 0000000000..3a84e163ed --- /dev/null +++ b/cortex-9.0.0-a10/src/IECoreGL/ToGLStateConverter.cpp @@ -0,0 +1,218 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2014, 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 "IECore/CompoundObject.h" +#include "IECore/SimpleTypedData.h" +#include "IECore/Shader.h" +#include "IECore/ObjectVector.h" + +#include "IECoreGL/ToGLStateConverter.h" +#include "IECoreGL/Primitive.h" +#include "IECoreGL/State.h" +#include "IECoreGL/PointsPrimitive.h" +#include "IECoreGL/CurvesPrimitive.h" +#include "IECoreGL/ShaderStateComponent.h" +#include "IECoreGL/ShaderLoader.h" +#include "IECoreGL/TextureLoader.h" + +using namespace IECore; +using namespace IECoreGL; + +////////////////////////////////////////////////////////////////////////// +// Individual state converters +////////////////////////////////////////////////////////////////////////// + +namespace +{ + +template +StateComponentPtr attributeToTypedState( const IECore::Object *attribute ) +{ + typedef IECore::TypedData DataType; + const DataType *d = runTimeCast( attribute ); + if( !d ) + { + throw Exception( boost::str( boost::format( "Expected data of type \"%s\"" ) % DataType::staticTypeName() ) ); + } + + return new T( d->readable() ); +} + +StateComponentPtr attributeToUseGLPointsState( const IECore::Object *attribute ) +{ + const StringData *d = runTimeCast( attribute ); + if( !d ) + { + throw Exception( "Expected data of type StringData" ); + } + + GLPointsUsage u; + const std::string &v = d->readable(); + if( v=="forGLPoints" ) + { + u = ForPointsOnly; + } + else if( v=="forParticlesAndDisks" ) + { + u = ForPointsAndDisks; + } + else if( v=="forAll" ) + { + u = ForAll; + } + else + { + throw IECore::Exception( boost::str( boost::format( "Unsupported value \"%s\"." ) % v ) ); + } + + return new PointsPrimitive::UseGLPoints( u ); +} + +StateComponentPtr attributeToShaderState( const IECore::Object *attribute ) +{ + const IECore::Shader *shader = runTimeCast( attribute ); + if( !shader ) + { + const ObjectVector *o = runTimeCast( attribute ); + if( o && o->members().size() ) + { + shader = runTimeCast( o->members()[0].get() ); + } + } + if( !shader ) + { + throw Exception( "Expected a Shader" ); + } + + const StringData *vertexSourceData = shader->parametersData()->member( "gl:vertexSource" ); + const StringData *geometrySourceData = shader->parametersData()->member( "gl:geometrySource" ); + const StringData *fragmentSourceData = shader->parametersData()->member( "gl:fragmentSource" ); + + std::string vertexSource = vertexSourceData ? vertexSourceData->readable() : ""; + std::string geometrySource = geometrySourceData ? geometrySourceData->readable() : ""; + std::string fragmentSource = fragmentSourceData ? fragmentSourceData->readable() : ""; + + if( vertexSource == "" && geometrySource == "" && fragmentSource == "" ) + { + ShaderLoader::defaultShaderLoader()->loadSource( shader->getName(), vertexSource, geometrySource, fragmentSource ); + } + + CompoundObjectPtr parametersData = new CompoundObject; + for( CompoundDataMap::const_iterator it=shader->parameters().begin(); it!=shader->parameters().end(); it++ ) + { + if( it->first!="gl:fragmentSource" && it->first!="gl:geometrySource" && it->first!="gl:vertexSource" ) + { + parametersData->members()[it->first] = it->second; + } + } + + return new ShaderStateComponent( ShaderLoader::defaultShaderLoader(), TextureLoader::defaultTextureLoader(), vertexSource, geometrySource, fragmentSource, parametersData ); +} + +typedef StateComponentPtr (*AttributeToState)( const IECore::Object *attribute ); +typedef std::map AttributeToStateMap; + +const AttributeToStateMap &attributeToStateMap() +{ + static AttributeToStateMap m; + if( !m.size() ) + { + m["gl:primitive:wireframe"] = attributeToTypedState; + m["gl:primitive:wireframeWidth"] = attributeToTypedState; + m["gl:primitive:bound"] = attributeToTypedState; + m["gl:primitive:solid"] = attributeToTypedState; + m["gl:primitive:outline"] = attributeToTypedState; + m["gl:primitive:outlineWidth"] = attributeToTypedState; + m["gl:primitive:points"] = attributeToTypedState; + m["gl:primitive:pointWidth"] = attributeToTypedState; + m["gl:primitive:wireframeColor"] = attributeToTypedState; + m["gl:primitive:boundColor"] = attributeToTypedState; + m["gl:primitive:outlineColor"] = attributeToTypedState; + m["gl:primitive:pointColor"] = attributeToTypedState; + m["gl:pointsPrimitive:useGLPoints"] = attributeToUseGLPointsState; + m["gl:pointsPrimitive:glPointWidth"] = attributeToTypedState; + m["doubleSided"] = attributeToTypedState; + m["gl:curvesPrimitive:useGLLines"] = attributeToTypedState; + m["gl:curvesPrimitive:glLineWidth"] = attributeToTypedState; + m["gl:curvesPrimitive:ignoreBasis"] = attributeToTypedState; + m["gl:smoothing:points"] = attributeToTypedState; + m["gl:smoothing:lines"] = attributeToTypedState; + m["gl:smoothing:polygons"] = attributeToTypedState; + m["gl:surface"] = attributeToShaderState; + } + return m; +} + +} // namespace + +////////////////////////////////////////////////////////////////////////// +// ToGLStateConverter implementation +////////////////////////////////////////////////////////////////////////// + +IE_CORE_DEFINERUNTIMETYPED( ToGLStateConverter ); + +ToGLConverter::ConverterDescription ToGLStateConverter::g_description; + +ToGLStateConverter::ToGLStateConverter( IECore::ConstCompoundObjectPtr toConvert ) + : ToGLConverter( "Converts IECore::CompoundObject objects to IECoreGL::State objects.", IECore::CompoundObjectTypeId ) +{ + srcParameter()->setValue( boost::const_pointer_cast( toConvert ) ); +} + +ToGLStateConverter::~ToGLStateConverter() +{ +} + +IECore::RunTimeTypedPtr ToGLStateConverter::doConversion( IECore::ConstObjectPtr src, IECore::ConstCompoundObjectPtr operands ) const +{ + const CompoundObject *co = runTimeCast( src.get() ); + if( !co ) + { + throw Exception( "Expected a CompoundObject" ); + } + + const AttributeToStateMap &m = attributeToStateMap(); + + const StatePtr result = new State( false ); + for( CompoundObject::ObjectMap::const_iterator it = co->members().begin(), eIt = co->members().end(); it != eIt; ++it ) + { + AttributeToStateMap::const_iterator mIt = m.find( it->first ); + if( mIt != m.end() ) + { + StateComponentPtr s = mIt->second( it->second.get() ); + result->add( s ); + } + } + return result; +} diff --git a/cortex-9.0.0-a6/src/IECoreGL/ToGLTextureConverter.cpp b/cortex-9.0.0-a10/src/IECoreGL/ToGLTextureConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/ToGLTextureConverter.cpp rename to cortex-9.0.0-a10/src/IECoreGL/ToGLTextureConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/TypedStateComponent.cpp b/cortex-9.0.0-a10/src/IECoreGL/TypedStateComponent.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/TypedStateComponent.cpp rename to cortex-9.0.0-a10/src/IECoreGL/TypedStateComponent.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/UIntTexture.cpp b/cortex-9.0.0-a10/src/IECoreGL/UIntTexture.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/UIntTexture.cpp rename to cortex-9.0.0-a10/src/IECoreGL/UIntTexture.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/UniformFunctions.cpp b/cortex-9.0.0-a10/src/IECoreGL/UniformFunctions.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/UniformFunctions.cpp rename to cortex-9.0.0-a10/src/IECoreGL/UniformFunctions.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/AlphaTextureBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/AlphaTextureBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/AlphaTextureBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/AlphaTextureBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/BindableBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/BindableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/BindableBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/BindableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/BufferBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/BufferBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/BufferBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/BufferBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/CachedConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/CachedConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/CachedConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/CachedConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/CameraBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/CameraBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/CameraBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/CameraBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ColorTextureBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ColorTextureBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ColorTextureBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ColorTextureBinding.cpp diff --git a/cortex-9.0.0-a10/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp new file mode 100644 index 0000000000..5e5bc95e43 --- /dev/null +++ b/cortex-9.0.0-a10/src/IECoreGL/bindings/CurvesPrimitiveBinding.cpp @@ -0,0 +1,73 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2014, 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 + +#include "IECorePython/RunTimeTypedBinding.h" + +#include "IECoreGL/CurvesPrimitive.h" + +#include "IECoreGL/bindings/CurvesPrimitiveBinding.h" +#include "IECoreGL/bindings/TypedStateComponentBinding.inl" + +using namespace boost::python; + +namespace IECoreGL +{ + +void bindCurvesPrimitive() +{ + scope s = IECorePython::RunTimeTypedClass() + .def( + init< + const IECore::CubicBasisf &, + bool, + IECore::ConstIntVectorDataPtr, + float + >( ( + arg_( "basis" ), + arg_( "periodic" ), + arg_( "vertsPerCurve" ), + arg_( "width" ) = 1.0f + ) ) + ) + ; + + bindTypedStateComponent( "IgnoreBasis" ); + bindTypedStateComponent( "UseGLLines" ); + bindTypedStateComponent( "GLLineWidth" ); + +} + +} // namespace IECoreGL diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/DepthTextureBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/DepthTextureBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/DepthTextureBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/DepthTextureBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/FontBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/FontBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/FontBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/FontBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/FontLoaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/FontLoaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/FontLoaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/FontLoaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/FrameBufferBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/FrameBufferBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/FrameBufferBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/FrameBufferBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/GroupBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/GroupBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/GroupBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/GroupBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/HitRecordBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/HitRecordBinding.cpp similarity index 97% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/HitRecordBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/HitRecordBinding.cpp index 7457cbccc1..ef62f9443e 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/bindings/HitRecordBinding.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/bindings/HitRecordBinding.cpp @@ -48,7 +48,7 @@ void bindHitRecord() { class_( "HitRecord", init() ) - .def( init() ) + .def( init() ) .def_readwrite( "depthMin", &HitRecord::depthMin ) .def_readwrite( "depthMax", &HitRecord::depthMax ) .def_readwrite( "name", &HitRecord::name ) diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/IECoreGLBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/IECoreGLBinding.cpp similarity index 96% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/IECoreGLBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/IECoreGLBinding.cpp index 9952d60b51..086a11a101 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/bindings/IECoreGLBinding.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/bindings/IECoreGLBinding.cpp @@ -75,6 +75,8 @@ #include "IECoreGL/bindings/BufferBinding.h" #include "IECoreGL/bindings/SplineToGLTextureConverterBinding.h" #include "IECoreGL/bindings/ShaderStateComponentBinding.h" +#include "IECoreGL/bindings/CurvesPrimitiveBinding.h" +#include "IECoreGL/bindings/ToGLStateConverterBinding.h" using namespace IECoreGL; using namespace boost::python; @@ -117,6 +119,8 @@ BOOST_PYTHON_MODULE( _IECoreGL ) bindBuffer(); bindSplineToGLTextureConverter(); bindShaderStateComponent(); + bindCurvesPrimitive(); + bindToGLStateConverter(); #ifdef IECORE_WITH_FREETYPE diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/LuminanceTextureBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/LuminanceTextureBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/LuminanceTextureBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/LuminanceTextureBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/MeshPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/NameStateComponentBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/NameStateComponentBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/NameStateComponentBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/NameStateComponentBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/OrthographicCameraBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/OrthographicCameraBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/OrthographicCameraBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/OrthographicCameraBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/PerspectiveCameraBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/PointsPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/PrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/PrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/PrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/PrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/RenderableBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/RenderableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/RenderableBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/RenderableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/RendererBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/RendererBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/RendererBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/SceneBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/SceneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/SceneBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/SceneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/SelectorBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/SelectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/SelectorBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/SelectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderLoaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderLoaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderLoaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderLoaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ShaderStateComponentBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/SplineToGLTextureConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/StateBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/StateBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/StateBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/StateBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/StateComponentBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/StateComponentBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/StateComponentBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/StateComponentBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/TextureBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/TextureBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/TextureBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/TextureBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/TextureLoaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/TextureLoaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/TextureLoaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/TextureLoaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLCameraConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLCurvesConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLMeshConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLPointsConverterBinding.cpp diff --git a/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp new file mode 100644 index 0000000000..023d8c3a47 --- /dev/null +++ b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLStateConverterBinding.cpp @@ -0,0 +1,53 @@ +////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2014, 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" + +#include "IECore/CompoundObject.h" + +#include "IECoreGL/ToGLStateConverter.h" +#include "IECoreGL/bindings/ToGLStateConverterBinding.h" + +#include "IECorePython/RunTimeTypedBinding.h" + +using namespace boost::python; +using namespace std; + + +void IECoreGL::bindToGLStateConverter() +{ + IECorePython::RunTimeTypedClass() + .def( init() ) + ; +} diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/ToGLTextureConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreGL/bindings/TypedStateComponentBinding.cpp b/cortex-9.0.0-a10/src/IECoreGL/bindings/TypedStateComponentBinding.cpp similarity index 93% rename from cortex-9.0.0-a6/src/IECoreGL/bindings/TypedStateComponentBinding.cpp rename to cortex-9.0.0-a10/src/IECoreGL/bindings/TypedStateComponentBinding.cpp index 492f40c773..a53d342c62 100644 --- a/cortex-9.0.0-a6/src/IECoreGL/bindings/TypedStateComponentBinding.cpp +++ b/cortex-9.0.0-a10/src/IECoreGL/bindings/TypedStateComponentBinding.cpp @@ -65,6 +65,9 @@ void bindTypedStateComponents() bindTypedStateComponent< ProceduralThreadingStateComponent >( "ProceduralThreadingStateComponent" ); bindTypedStateComponent< CameraVisibilityStateComponent >( "CameraVisibilityStateComponent" ); bindTypedStateComponent< AutomaticInstancingStateComponent >( "AutomaticInstancingStateComponent" ); + bindTypedStateComponent< PointSmoothingStateComponent >( "PointSmoothingStateComponent" ); + bindTypedStateComponent< LineSmoothingStateComponent >( "LineSmoothingStateComponent" ); + bindTypedStateComponent< PolygonSmoothingStateComponent >( "PolygonSmoothingStateComponent" ); enum_( "GLPointsUsage" ) .value( "ForPointsOnly", ForPointsOnly ) diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/Convert.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/Convert.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/Convert.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/Convert.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/CoreHoudini.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/CoreHoudini.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/CoreHoudini.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/CoreHoudini.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/DetailSplitter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/DetailSplitter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/DetailSplitter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/DetailSplitter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FnParameterisedHolder.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FnParameterisedHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FnParameterisedHolder.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FnParameterisedHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCompoundObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCortexObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniCurvesConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniGeometryConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniGroupConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniGroupConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniGroupConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniGroupConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniPointsConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniPointsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniPointsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniPointsConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GEO_CobIOTranslator.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GEO_CobIOTranslator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GEO_CobIOTranslator.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GEO_CobIOTranslator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GEO_CortexPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GEO_CortexPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GEO_CortexPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GEO_CortexPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GR_Cortex.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GR_Cortex.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GR_Cortex.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GR_Cortex.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GR_CortexPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GR_CortexPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GR_CortexPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GR_CortexPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GUI_CortexPrimitiveHook.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/GU_CortexPrimitive.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/GU_CortexPrimitive.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/GU_CortexPrimitive.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/GU_CortexPrimitive.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/HoudiniHeaderGenerator.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/HoudiniHeaderGenerator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/HoudiniHeaderGenerator.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/HoudiniHeaderGenerator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/LiveScene.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/LiveScene.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/LiveScene.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/LiveScene.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/MessageHandler.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/MessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/MessageHandler.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/MessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/NodeHandle.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/NodeHandle.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/NodeHandle.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/NodeHandle.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheGeometry.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheNode.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheNode.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheNode.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheNode.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/OBJ_SceneCacheTransform.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ParameterisedHolder.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ParameterisedHolder.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ParameterisedHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ParameterisedHolderInterface.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ParameterisedHolderInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ParameterisedHolderInterface.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ParameterisedHolderInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/RATDeepImageReader.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/RATDeepImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/RATDeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/RATDeepImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/RATDeepImageWriter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/RATDeepImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/RATDeepImageWriter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/RATDeepImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ROP_SceneCacheWriter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ROP_SceneCacheWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ROP_SceneCacheWriter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ROP_SceneCacheWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_CortexConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_CortexConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_CortexConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_CortexConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_InterpolatedCacheReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_OpHolder.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_OpHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_OpHolder.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_OpHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_ParameterisedHolder.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_ParameterisedHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_ParameterisedHolder.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_ParameterisedHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_ProceduralHolder.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_ProceduralHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_ProceduralHolder.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_ProceduralHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_SceneCacheSource.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_SceneCacheSource.cpp similarity index 97% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_SceneCacheSource.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_SceneCacheSource.cpp index d01005d168..960bc02440 100644 --- a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_SceneCacheSource.cpp +++ b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_SceneCacheSource.cpp @@ -440,7 +440,9 @@ ConstObjectPtr SOP_SceneCacheSource::modifyObject( const IECore::Object *object, modified = primitive->copy(); } - modified->variables[values[1]] = modified->variables[values[0]]; + // we need to copy the data in case either copy will be modified later on + const PrimitiveVariable &orig = modified->variables[values[0]]; + modified->variables[values[1]] = PrimitiveVariable( orig.interpolation, orig.data->copy() ); } } @@ -470,7 +472,7 @@ ConstObjectPtr SOP_SceneCacheSource::transformObject( const IECore::Object *obje transformer->copyParameter()->setTypedValue( true ); transformer->matrixParameter()->setValue( new M44dData( transform ) ); - // add all Point and Normal prim vars to the transformation list + // add all Point and Normal prim vars to the transformation list, except for rest/Pref const PrimitiveVariableMap &variables = primitive->variables; std::vector &primVars = transformer->primVarsParameter()->getTypedValue(); primVars.clear(); @@ -478,6 +480,12 @@ ConstObjectPtr SOP_SceneCacheSource::transformObject( const IECore::Object *obje { if ( despatchTypedData( it->second.data.get() ) ) { + // we don't want to alter rest/Pref because Houdini excepts these to be non-transforming prim vars + if ( it->first == "rest" || it->first == "Pref" ) + { + continue; + } + primVars.push_back( it->first ); // add the transforming prim vars to the animated list diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SOP_SceneCacheTransform.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SOP_SceneCacheTransform.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SOP_SceneCacheTransform.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SOP_SceneCacheTransform.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/SceneCacheNode.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/SceneCacheNode.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/SceneCacheNode.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/SceneCacheNode.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniAttribConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniAttribConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniAttribConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniAttribConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCompoundObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCortexObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniCurvesConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp index bdd806eae3..75e0f90b53 100644 --- a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp +++ b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniGeometryConverter.cpp @@ -338,7 +338,13 @@ void ToHoudiniGeometryConverter::transferAttribValues( { try { - converter->convert( name, geo, points ); + GA_RWAttributeRef attrRef = converter->convert( name, geo, points ); + + // mark rest as non-transforming so it doesn't get manipulated once inside Houdini + if ( name == "rest" || name == "Pref" ) + { + attrRef.getAttribute()->setNonTransforming( true ); + } } catch ( std::exception &e ) { diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniGroupConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniGroupConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniGroupConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniGroupConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniNumericAttribConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniPointsConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniPointsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniPointsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniPointsConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniPolygonsConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/ToHoudiniStringAttribConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/UT_ObjectPoolCache.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/UT_ObjectPoolCache.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/UT_ObjectPoolCache.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/UT_ObjectPoolCache.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCompoundObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCortexObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniCurvesConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniGroupConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniPointsConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/FromHoudiniPolygonsConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/IECoreHoudiniModule.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/LiveSceneBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/LiveSceneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/LiveSceneBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/LiveSceneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/RATDeepImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/RATDeepImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudinGeometryConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCompoundObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCortexObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniCurvesConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniGroupConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniPointsConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/ToHoudiniPolygonsConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/bindings/TypeIdBinding.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/bindings/TypeIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/bindings/TypeIdBinding.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/bindings/TypeIdBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreHoudini/plugin/Plugin.cpp b/cortex-9.0.0-a10/src/IECoreHoudini/plugin/Plugin.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreHoudini/plugin/Plugin.cpp rename to cortex-9.0.0-a10/src/IECoreHoudini/plugin/Plugin.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/BoolParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/BoolParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/BoolParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/BoolParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/Box3Manipulator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/Box3Manipulator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/Box3Manipulator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/Box3Manipulator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/BoxParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/BoxParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/BoxParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/BoxParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/CacheSet.cpp b/cortex-9.0.0-a10/src/IECoreMaya/CacheSet.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/CacheSet.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/CacheSet.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/CallbackId.cpp b/cortex-9.0.0-a10/src/IECoreMaya/CallbackId.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/CallbackId.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/CallbackId.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ClassParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ClassParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ClassParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ClassParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ClassVectorParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ClassVectorParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ClassVectorParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ClassVectorParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ColorSplineParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ColorSplineParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ColorSplineParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ColorSplineParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/CompoundNumericParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/CompoundNumericParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/CompoundNumericParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/CompoundNumericParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/CompoundParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/CompoundParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/CompoundParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/CompoundParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/Convert.cpp b/cortex-9.0.0-a10/src/IECoreMaya/Convert.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/Convert.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/Convert.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ConverterHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ConverterHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ConverterHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ConverterHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/CurveCombiner.cpp b/cortex-9.0.0-a10/src/IECoreMaya/CurveCombiner.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/CurveCombiner.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/CurveCombiner.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/DateTimeParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/DateTimeParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/DateTimeParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/DateTimeParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/DelightProceduralCacheCommand.cpp b/cortex-9.0.0-a10/src/IECoreMaya/DelightProceduralCacheCommand.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/DelightProceduralCacheCommand.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/DelightProceduralCacheCommand.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/DisplayStyle.cpp b/cortex-9.0.0-a10/src/IECoreMaya/DisplayStyle.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/DisplayStyle.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/DisplayStyle.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/DrawableHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/DrawableHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/DrawableHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/DrawableHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/DrawableHolderUI.cpp b/cortex-9.0.0-a10/src/IECoreMaya/DrawableHolderUI.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/DrawableHolderUI.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/DrawableHolderUI.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FloatSplineParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FloatSplineParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FloatSplineParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FloatSplineParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaArrayDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaArrayDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaArrayDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaArrayDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaCameraConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaCameraConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaCameraConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaCameraConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaCompoundNumericPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaCurveConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaCurveConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaCurveConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaCurveConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaDagNodeConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaDagNodeConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaDagNodeConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaDagNodeConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaFluidConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaFluidConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaFluidConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaFluidConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaGroupConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaGroupConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaGroupConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaGroupConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaImageConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaImageConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaImageConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaImageConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaLocatorConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaLocatorConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaLocatorConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaLocatorConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaMatrixDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaMatrixDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaMatrixDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaMatrixDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaMatrixVectorDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaMeshConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaMeshConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaMeshConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaMeshConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaNumericDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaNumericDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaNumericDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaNumericDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaNumericPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaNumericPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaNumericPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaNumericPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaObjectDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaObjectDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaObjectDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaObjectDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaParticleConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaParticleConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaParticleConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaParticleConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaPluginDataPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaProceduralHolderConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaShapeConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaShapeConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaShapeConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaShapeConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaSkinClusterConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaSkinClusterConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaSkinClusterConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaSkinClusterConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaStringPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaStringPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaStringPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaStringPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaTransformConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaTransformConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaTransformConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaTransformConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaTransformationMatrixConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/FromMayaUnitPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/FromMayaUnitPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/FromMayaUnitPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/FromMayaUnitPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/GeometryCombiner.cpp b/cortex-9.0.0-a10/src/IECoreMaya/GeometryCombiner.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/GeometryCombiner.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/GeometryCombiner.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/IECoreMaya.cpp b/cortex-9.0.0-a10/src/IECoreMaya/IECoreMaya.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/IECoreMaya.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/IECoreMaya.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ImageFile.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ImageFile.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ImageFile.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ImageFile.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ImagePlaneHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ImagePlaneHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ImagePlaneHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ImagePlaneHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ImageViewportPostProcess.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ImageViewportPostProcess.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ImageViewportPostProcess.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ImageViewportPostProcess.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/LineSegmentParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/LineSegmentParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/LineSegmentParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/LineSegmentParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/LiveScene.cpp b/cortex-9.0.0-a10/src/IECoreMaya/LiveScene.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECoreMaya/LiveScene.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/LiveScene.cpp index 886f91f182..341b6c51c3 100644 --- a/cortex-9.0.0-a6/src/IECoreMaya/LiveScene.cpp +++ b/cortex-9.0.0-a10/src/IECoreMaya/LiveScene.cpp @@ -37,6 +37,7 @@ #include "IECore/Camera.h" #include "IECore/TransformationMatrixData.h" #include "IECore/Primitive.h" +#include "IECore/NullObject.h" #include "IECoreMaya/LiveScene.h" #include "IECoreMaya/FromMayaTransformConverter.h" @@ -374,7 +375,7 @@ ConstObjectPtr LiveScene::readAttribute( const Name &name, double time ) const } return attr; } - return 0; + return IECore::NullObject::defaultNullObject(); } void LiveScene::writeAttribute( const Name &name, const Object *attribute, double time ) @@ -548,7 +549,7 @@ ConstObjectPtr LiveScene::readObject( double time ) const } } } - return 0; + return IECore::NullObject::defaultNullObject(); } PrimitiveVariableMap LiveScene::readObjectPrimitiveVariables( const std::vector &primVarNames, double time ) const diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MDataHandleAccessor.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MDataHandleAccessor.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MDataHandleAccessor.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MDataHandleAccessor.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MayaHeaderGenerator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MayaHeaderGenerator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MayaHeaderGenerator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MayaHeaderGenerator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MayaPythonUtil.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MayaPythonUtil.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MayaPythonUtil.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MayaPythonUtil.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MayaTime.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MayaTime.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MayaTime.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MayaTime.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MeshParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MeshParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MeshParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MeshParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/MessageHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/MessageHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/MessageHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/MessageHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/NumericParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/NumericParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/NumericParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/NumericParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/NumericTraits.cpp b/cortex-9.0.0-a10/src/IECoreMaya/NumericTraits.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/NumericTraits.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/NumericTraits.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ObjectData.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ObjectData.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ObjectData.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ObjectData.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ObjectMFnDataParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ObjectParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ObjectParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ObjectParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ObjectParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ObjectVectorParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ObjectVectorParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ObjectVectorParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ObjectVectorParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/OpHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/OpHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/OpHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/OpHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterManipContainer.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterManipContainer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterManipContainer.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterManipContainer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderInterface.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderInterface.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderManipContext.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderManipContext.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderManipContext.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderManipContext.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderManipContextCommand.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderModificationCmd.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ParameterisedHolderSetValueCmd.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/PlaybackFrameList.cpp b/cortex-9.0.0-a10/src/IECoreMaya/PlaybackFrameList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/PlaybackFrameList.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/PlaybackFrameList.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/PostLoadCallback.cpp b/cortex-9.0.0-a10/src/IECoreMaya/PostLoadCallback.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/PostLoadCallback.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/PostLoadCallback.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolder.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolder.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolderComponentBoundIterator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolderUI.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolderUI.cpp similarity index 99% rename from cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolderUI.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolderUI.cpp index 127f4a7ba7..323ab71915 100644 --- a/cortex-9.0.0-a6/src/IECoreMaya/ProceduralHolderUI.cpp +++ b/cortex-9.0.0-a10/src/IECoreMaya/ProceduralHolderUI.cpp @@ -402,7 +402,9 @@ bool ProceduralHolderUI::select( MSelectInfo &selectInfo, MSelectionList &select depthMinIndex = componentIndices.length(); } - ProceduralHolder::ComponentsMap::const_iterator compIt = proceduralHolder->m_componentsMap.find( hits[i].name.value() ); + ProceduralHolder::ComponentsMap::const_iterator compIt = proceduralHolder->m_componentsMap.find( + IECoreGL::NameStateComponent::nameFromGLName( hits[i].name ) + ); assert( compIt != proceduralHolder->m_componentsMap.end() ); componentIndices.append( compIt->second.first ); } diff --git a/cortex-9.0.0-a6/src/IECoreMaya/PythonCmd.cpp b/cortex-9.0.0-a10/src/IECoreMaya/PythonCmd.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/PythonCmd.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/PythonCmd.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/SceneShape.cpp b/cortex-9.0.0-a10/src/IECoreMaya/SceneShape.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECoreMaya/SceneShape.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/SceneShape.cpp index c2c51dd81a..eefa5948da 100644 --- a/cortex-9.0.0-a6/src/IECoreMaya/SceneShape.cpp +++ b/cortex-9.0.0-a10/src/IECoreMaya/SceneShape.cpp @@ -355,8 +355,14 @@ bool SceneShape::hasSceneShapeObject( const MDagPath &p ) { return false; } - - return sceneShape->getSceneInterface()->hasObject(); + + IECore::ConstSceneInterfacePtr sceneInterface = sceneShape->getSceneInterface(); + if( !sceneInterface ) + { + return false; + } + + return sceneInterface->hasObject(); } ConstObjectPtr SceneShape::readSceneShapeObject( const MDagPath &p ) diff --git a/cortex-9.0.0-a6/src/IECoreMaya/SceneShapeInterface.cpp b/cortex-9.0.0-a10/src/IECoreMaya/SceneShapeInterface.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/SceneShapeInterface.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/SceneShapeInterface.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/SceneShapeUI.cpp b/cortex-9.0.0-a10/src/IECoreMaya/SceneShapeUI.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/SceneShapeUI.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/SceneShapeUI.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/StatusException.cpp b/cortex-9.0.0-a10/src/IECoreMaya/StatusException.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/StatusException.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/StatusException.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/StringParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/StringParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/StringParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/StringParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/StringVectorParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/StringVectorParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/StringVectorParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/StringVectorParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/SystemExitCmd.cpp b/cortex-9.0.0-a10/src/IECoreMaya/SystemExitCmd.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/SystemExitCmd.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/SystemExitCmd.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaArrayDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaArrayDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaArrayDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaArrayDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaCameraConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaCameraConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaCameraConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaCameraConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaCurveConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaCurveConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaCurveConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaCurveConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaGroupConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaGroupConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaGroupConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaGroupConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaImageConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaImageConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaImageConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaImageConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaLocatorConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaLocatorConverter.cpp similarity index 97% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaLocatorConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaLocatorConverter.cpp index cbebe0e9e5..f5bbb389d1 100644 --- a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaLocatorConverter.cpp +++ b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaLocatorConverter.cpp @@ -118,7 +118,12 @@ bool ToMayaLocatorConverter::doConversion( IECore::ConstObjectPtr from, MObject MFnDagNode fnLocator( locatorObj ); - Imath::M44f m = coordSys->getTransform()->transform(); + Imath::M44f m; + const IECore::Transform* transform = coordSys->getTransform(); + if( transform ) + { + m = transform->transform(); + } Imath::V3f s,h,r,t; Imath::extractSHRT(m, s, h, r, t); diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaMatrixDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaMatrixDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaMatrixDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaMatrixDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaMatrixVectorDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaMeshConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaMeshConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaMeshConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaMeshConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaNumericDataConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaNumericDataConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaNumericDataConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaNumericDataConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaObjectConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaObjectConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaObjectConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaObjectConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaParticleConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaParticleConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaParticleConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaParticleConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaPlugConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaPlugConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaPlugConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaPlugConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ToMayaSkinClusterConverter.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ToMayaSkinClusterConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ToMayaSkinClusterConverter.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ToMayaSkinClusterConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/TransformationMatrixManipulator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/TransformationMatrixManipulator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/TransformationMatrixManipulator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/TransformationMatrixManipulator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/TransformationMatrixParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreMaya/TransformationMatrixParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/TransformationMatrixParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/TransformationMatrixParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/TransientParameterisedHolderNode.cpp b/cortex-9.0.0-a10/src/IECoreMaya/TransientParameterisedHolderNode.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/TransientParameterisedHolderNode.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/TransientParameterisedHolderNode.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/V3Manipulator.cpp b/cortex-9.0.0-a10/src/IECoreMaya/V3Manipulator.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/V3Manipulator.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/V3Manipulator.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcess.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcess.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcess.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcess.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcessCallback.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcessCallback.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcessCallback.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcessCallback.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/ViewportPostProcessCallbackBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/CallbackIdBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/CallbackIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/CallbackIdBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/CallbackIdBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FnProceduralHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FnSceneShapeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaArrayDataConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCameraConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCompoundNumericPlugConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaCurveConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaDagNodeConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaGroupConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaImageConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaLocatorConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaMeshConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaNumericPlugConvertBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaParticleConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaPlugConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaProcedualHolderConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaShapeConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaSkinClusterConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaStringPlugConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaTransformConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaTransformationMatrixConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/FromMayaUnitPlugConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/IECoreMaya.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/IECoreMaya.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/IECoreMaya.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/IECoreMaya.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ImageViewportPostProcessBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/LiveSceneBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/LiveSceneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/LiveSceneBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/LiveSceneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MDagPathFromPython.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MDagPathFromPython.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MDagPathFromPython.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MDagPathFromPython.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MObjectFromPython.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MObjectFromPython.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MObjectFromPython.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MObjectFromPython.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MPlugFromPython.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MPlugFromPython.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MPlugFromPython.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MPlugFromPython.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MStringFromPython.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MStringFromPython.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MStringFromPython.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MStringFromPython.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaMeshBuilderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaPythonUtilBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MayaTypeIdBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/MessageHandlerBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/MessageHandlerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/MessageHandlerBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/MessageHandlerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/PlaybackFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/StandaloneBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/StandaloneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/StandaloneBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/StandaloneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaCameraConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaCurveConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaGroupConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaImageConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaLocatorConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaMeshConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaObjectConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaParticleConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaPlugConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ToMayaSkinClusterConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/TypeIdBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/TypeIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/TypeIdBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/TypeIdBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp b/cortex-9.0.0-a10/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/bindings/ViewportPostProcessBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/plugin/Loader.cpp b/cortex-9.0.0-a10/src/IECoreMaya/plugin/Loader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/plugin/Loader.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/plugin/Loader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreMaya/plugin/Plugin.cpp b/cortex-9.0.0-a10/src/IECoreMaya/plugin/Plugin.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreMaya/plugin/Plugin.cpp rename to cortex-9.0.0-a10/src/IECoreMaya/plugin/Plugin.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/BoolParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/BoolParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/BoolParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/BoolParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/Box3ParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/Box3ParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/Box3ParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/Box3ParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ClassParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ClassParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ClassParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ClassParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ClassVectorParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ClassVectorParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ClassVectorParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ClassVectorParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/Color3fParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/Color3fParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/Color3fParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/Color3fParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/CompoundParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/CompoundParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/CompoundParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/CompoundParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/Convert.cpp b/cortex-9.0.0-a10/src/IECoreNuke/Convert.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/Convert.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/Convert.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/DeepImageReader.cpp b/cortex-9.0.0-a10/src/IECoreNuke/DeepImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/DeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/DeepImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/DisplayIop.cpp b/cortex-9.0.0-a10/src/IECoreNuke/DisplayIop.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/DisplayIop.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/DisplayIop.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/DrawableHolder.cpp b/cortex-9.0.0-a10/src/IECoreNuke/DrawableHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/DrawableHolder.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/DrawableHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/FloatParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/FloatParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/FloatParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/FloatParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/FromNukeCameraConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/FromNukeCameraConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/FromNukeCameraConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/FromNukeCameraConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/FromNukeConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/FromNukeConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/FromNukeConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/FromNukeConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/FromNukePointsConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/FromNukePointsConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/FromNukePointsConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/FromNukePointsConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/FromNukeTileConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/FromNukeTileConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/FromNukeTileConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/FromNukeTileConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ImagePrimitiveParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/IntParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/IntParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/IntParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/IntParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/LensDistort.cpp b/cortex-9.0.0-a10/src/IECoreNuke/LensDistort.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/LensDistort.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/LensDistort.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/LineSegment3ParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/LineSegment3ParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/LineSegment3ParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/LineSegment3ParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/MeshFromNuke.cpp b/cortex-9.0.0-a10/src/IECoreNuke/MeshFromNuke.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/MeshFromNuke.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/MeshFromNuke.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/MeshPrimitiveParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/MeshToNukeGeometryConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/MeshToNukeGeometryConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/MeshToNukeGeometryConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/MeshToNukeGeometryConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ObjectHolder.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ObjectHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ObjectHolder.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ObjectHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ObjectKnob.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ObjectKnob.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ObjectKnob.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ObjectKnob.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ObjectVectorParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ObjectVectorParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ObjectVectorParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ObjectVectorParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/OpHolder.cpp b/cortex-9.0.0-a10/src/IECoreNuke/OpHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/OpHolder.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/OpHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ParameterisedHolder.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ParameterisedHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ParameterisedHolder.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ParameterisedHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/PathParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/PathParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/PathParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/PathParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/PresetsOnlyParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/PresetsOnlyParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/PresetsOnlyParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/PresetsOnlyParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ProceduralHolder.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ProceduralHolder.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ProceduralHolder.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ProceduralHolder.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/Python.cpp b/cortex-9.0.0-a10/src/IECoreNuke/Python.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/Python.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/Python.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/SceneCacheReader.cpp b/cortex-9.0.0-a10/src/IECoreNuke/SceneCacheReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/SceneCacheReader.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/SceneCacheReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/StringParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/StringParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/StringParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/StringParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ToNukeConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ToNukeConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ToNukeConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ToNukeConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/ToNukeGeometryConverter.cpp b/cortex-9.0.0-a10/src/IECoreNuke/ToNukeGeometryConverter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/ToNukeGeometryConverter.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/ToNukeGeometryConverter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/VecParameterHandler.cpp b/cortex-9.0.0-a10/src/IECoreNuke/VecParameterHandler.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/VecParameterHandler.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/VecParameterHandler.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/Warp.cpp b/cortex-9.0.0-a10/src/IECoreNuke/Warp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/Warp.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/Warp.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/bindings/FnOpHolderBinding.cpp b/cortex-9.0.0-a10/src/IECoreNuke/bindings/FnOpHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/bindings/FnOpHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/bindings/FnOpHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp b/cortex-9.0.0-a10/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/bindings/FnParameterisedHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/bindings/IECoreNuke.cpp b/cortex-9.0.0-a10/src/IECoreNuke/bindings/IECoreNuke.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/bindings/IECoreNuke.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/bindings/IECoreNuke.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/bindings/ObjectKnobBinding.cpp b/cortex-9.0.0-a10/src/IECoreNuke/bindings/ObjectKnobBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/bindings/ObjectKnobBinding.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/bindings/ObjectKnobBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/plugin/Plugin.cpp b/cortex-9.0.0-a10/src/IECoreNuke/plugin/Plugin.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/plugin/Plugin.cpp rename to cortex-9.0.0-a10/src/IECoreNuke/plugin/Plugin.cpp diff --git a/cortex-9.0.0-a6/src/IECoreNuke/plugin/ieProcedural.tcl b/cortex-9.0.0-a10/src/IECoreNuke/plugin/ieProcedural.tcl similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/plugin/ieProcedural.tcl rename to cortex-9.0.0-a10/src/IECoreNuke/plugin/ieProcedural.tcl diff --git a/cortex-9.0.0-a6/src/IECoreNuke/plugin/menu.py b/cortex-9.0.0-a10/src/IECoreNuke/plugin/menu.py similarity index 100% rename from cortex-9.0.0-a6/src/IECoreNuke/plugin/menu.py rename to cortex-9.0.0-a10/src/IECoreNuke/plugin/menu.py diff --git a/cortex-9.0.0-a6/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/AddSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/AlexaLogcToLinearOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/AlexaLogcToLinearOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/AlexaLogcToLinearOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/AlexaLogcToLinearOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/AngleConversionBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/AngleConversionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/AngleConversionBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/AngleConversionBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/AttributeCacheBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/AttributeCacheBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/AttributeCacheBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/AttributeCacheBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/AttributeStateBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/AttributeStateBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/AttributeStateBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/AttributeStateBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/BezierAlgoBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/BezierAlgoBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/BezierAlgoBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/BezierAlgoBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/BinaryFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/BinaryFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/BinaryFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/BinaryFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/BlindDataHolderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/BlindDataHolderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/BlindDataHolderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/BlindDataHolderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/BoundedKDTreeBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/BoundedKDTreeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/BoundedKDTreeBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/BoundedKDTreeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CINImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CINImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CINImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CINImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CINImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CINImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CINImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CINImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CachedReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CachedReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CachedReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CachedReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CamelCaseBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CamelCaseBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CamelCaseBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CamelCaseBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CameraBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CameraBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CameraBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CameraBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CameraControllerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CameraControllerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CameraControllerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CameraControllerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CapturingRendererBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CapturingRendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CapturingRendererBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CapturingRendererBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ChannelOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ChannelOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ChannelOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ChannelOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CineonToLinearOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CineonToLinearOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CineonToLinearOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CineonToLinearOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ClampOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ClampOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ClampOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ClampOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ClientDisplayDriverBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ClientDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ClientDisplayDriverBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ClientDisplayDriverBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ColorSpaceTransformOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ColorSpaceTransformOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ColorSpaceTransformOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ColorSpaceTransformOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ColorTransformOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ColorTransformOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ColorTransformOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CompoundDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CompoundDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CompoundDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CompoundDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CompoundFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CompoundFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CompoundFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CompoundFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CompoundObjectBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CompoundObjectBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CompoundObjectBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CompoundObjectBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CompoundParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CompoundParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CompoundParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CompoundParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CompressSmoothSkinningDataOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ContrastSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ConverterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CoordinateSystemBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CoordinateSystemBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CoordinateSystemBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CoordinateSystemBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CubeColorLookupBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CubeColorLookupBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CubeColorLookupBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CubeColorLookupBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CubeColorLookupDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CubeColorLookupDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CubeColorLookupDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CubeColorLookupDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CubeColorLookupParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CubeColorLookupParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CubeColorLookupParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CubeColorLookupParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CubeColorTransformOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CubeColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CubeColorTransformOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CubeColorTransformOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CubicBasisBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CubicBasisBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CubicBasisBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CubicBasisBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurveExtrudeOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurveExtrudeOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurveExtrudeOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurveExtrudeOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurveLineariserBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurveLineariserBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurveLineariserBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurveLineariserBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurveTangentsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurveTangentsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurveTangentsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurveTangentsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurveTracerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurveTracerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurveTracerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurveTracerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurvesMergeOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurvesMergeOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurvesMergeOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurvesMergeOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurvesPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurvesPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurvesPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurvesPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/CurvesPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DPXImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DPXImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DPXImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DPXImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DPXImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DPXImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DPXImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DPXImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DataCastOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DataCastOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DataCastOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DataCastOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DataConvertOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DataConvertOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DataConvertOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DataConvertOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DataInterleaveOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DataInterleaveOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DataInterleaveOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DataInterleaveOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DataPromoteOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DataPromoteOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DataPromoteOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DataPromoteOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DateTimeDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DateTimeDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DateTimeDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DateTimeDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DateTimeParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DateTimeParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DateTimeParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DateTimeParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DecompressSmoothSkinningDataOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DeepImageConverterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DeepImageConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DeepImageConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DeepImageConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DeepImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DeepImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DeepImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DeepImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DeepImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DeepImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DeepPixelBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DeepPixelBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DeepPixelBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DeepPixelBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DirNameParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DirNameParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DirNameParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DirNameParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DiskPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DiskPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DiskPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DiskPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DisplayBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DisplayBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DisplayBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DisplayBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DisplayDriverBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DisplayDriverBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DisplayDriverBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DisplayDriverBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/DisplayDriverServerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/DisplayDriverServerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/DisplayDriverServerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/DisplayDriverServerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EXRDeepImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EXRDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EXRDeepImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EXRDeepImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EXRDeepImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EXRDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EXRDeepImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EXRDeepImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EXRImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EXRImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EXRImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EXRImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EXRImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EXRImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EXRImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EXRImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EmptyFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EmptyFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EmptyFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EmptyFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EnvMapSHProjectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EnvMapSHProjectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EnvMapSHProjectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EnvMapSHProjectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/EnvMapSamplerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/EnvMapSamplerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/EnvMapSamplerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/EnvMapSamplerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ExceptionBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ExceptionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ExceptionBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ExceptionBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ExclusionFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ExclusionFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ExclusionFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ExclusionFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ExternalProceduralBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ExternalProceduralBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ExternalProceduralBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ExternalProceduralBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FaceAreaOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FaceAreaOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FaceAreaOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FaceAreaOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FaceVaryingPromotionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FaceVaryingPromotionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FaceVaryingPromotionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FaceVaryingPromotionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FileNameParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FileNameParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FileNameParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FileNameParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FileSequenceBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FileSequenceBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FileSequenceBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FileSequenceBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FileSequenceFunctionsBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FileSequenceFunctionsBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FileSequenceFunctionsBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FileSequenceFunctionsBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FileSequenceParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FileSequenceParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FileSequenceParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FileSequenceParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FileSequenceVectorParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FileSequenceVectorParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FileSequenceVectorParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FileSequenceVectorParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FontBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FontBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FontBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FontBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FrameListParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FrameListParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FrameListParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FrameListParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FrameRangeBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FrameRangeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FrameRangeBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FrameRangeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/FromCoreConverterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/FromCoreConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/FromCoreConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/FromCoreConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/GeometricTypedDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/GeometricTypedDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/GeometricTypedDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/GeometricTypedDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/GradeBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/GradeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/GradeBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/GradeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/GroupBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/GroupBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/GroupBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/GroupBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HalfBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HalfBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HalfBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HalfBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HdrMergeOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HdrMergeOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HdrMergeOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HdrMergeOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HeaderGeneratorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HeaderGeneratorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HeaderGeneratorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HeaderGeneratorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HenyeyGreensteinBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HenyeyGreensteinBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HenyeyGreensteinBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HenyeyGreensteinBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HexConversionBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HexConversionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HexConversionBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HexConversionBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/HitMissTransformBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/HitMissTransformBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/HitMissTransformBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/HitMissTransformBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageCompositeOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageCompositeOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageCompositeOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageCompositeOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageConvolveOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageConvolveOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageConvolveOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageConvolveOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageCropOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageCropOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageCropOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageCropOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageDiffOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageDiffOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageDiffOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageDiffOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageDisplayDriverBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageDisplayDriverBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageDisplayDriverBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImagePremultiplyOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImagePremultiplyOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImagePremultiplyOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImagePremultiplyOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImagePrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImagePrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImagePrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImagePrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImagePrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageThinnerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageThinnerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageThinnerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageThinnerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageUnpremultiplyOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageUnpremultiplyOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageUnpremultiplyOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageUnpremultiplyOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathBoxBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathBoxBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathBoxBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathBoxBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathBoxVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathBoxVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathBoxVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathBoxVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathColorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathColorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathColorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathColorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathColorVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathColorVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathColorVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathColorVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathEulerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathEulerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathEulerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathEulerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathMatrixBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathMatrixBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathMatrixBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathMatrixBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathMatrixVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathMatrixVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathMatrixVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathMatrixVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathPlaneBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathPlaneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathPlaneBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathPlaneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathQuatBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathQuatBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathQuatBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathQuatBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathQuatVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathQuatVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathQuatVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathQuatVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathRandomBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathRandomBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathRandomBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathRandomBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathRootsBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathRootsBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathRootsBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathRootsBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathVecBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathVecBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathVecBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathVecBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImathVecVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImathVecVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImathVecVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImathVecVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImfBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImfBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImfBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImfBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ImfTimeCodeBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ImfTimeCodeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ImfTimeCodeBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ImfTimeCodeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/IndexedIOBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/IndexedIOBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/IndexedIOBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/IndexedIOBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/InternedStringBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/InternedStringBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/InternedStringBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/InternedStringBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/InterpolatedCacheBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/InterpolatedCacheBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/InterpolatedCacheBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/InterpolatedCacheBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/InverseDistanceWeightedInterpolationBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/JPEGImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/JPEGImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/JPEGImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/JPEGImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/JPEGImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/JPEGImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/JPEGImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/JPEGImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/KDTreeBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/KDTreeBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/KDTreeBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/KDTreeBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LRUCacheBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LRUCacheBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LRUCacheBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LRUCacheBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LensDistortOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LensDistortOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LensDistortOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LensDistortOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LensModelBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LensModelBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LensModelBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LensModelBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LevenbergMarquardtBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LevenbergMarquardtBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LevenbergMarquardtBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LevenbergMarquardtBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LightBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LightBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LightBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LightBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LimitSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LineSegmentBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LineSegmentBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LineSegmentBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LineSegmentBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinearToAlexaLogcOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinearToAlexaLogcOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinearToAlexaLogcOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinearToAlexaLogcOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinearToCineonOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinearToCineonOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinearToCineonOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinearToCineonOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinearToPanalogOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinearToPanalogOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinearToPanalogOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinearToPanalogOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinearToRec709OpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinearToRec709OpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinearToRec709OpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinearToRec709OpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinearToSRGBOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinearToSRGBOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinearToSRGBOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinearToSRGBOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LinkedSceneBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LinkedSceneBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LinkedSceneBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LinkedSceneBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LookupBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LookupBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LookupBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LookupBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/LuminanceOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/LuminanceOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/LuminanceOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/LuminanceOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MPlayDisplayDriverBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MPlayDisplayDriverBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MPlayDisplayDriverBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MPlayDisplayDriverBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MappedRandomPointDistributionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MarschnerLookupTableOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MarschnerLookupTableOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MarschnerLookupTableOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MarschnerLookupTableOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MarschnerParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MarschnerParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MarschnerParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MarschnerParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MathBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MathBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MathBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MathBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MatrixMotionTransformBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MatrixMotionTransformBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MatrixMotionTransformBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MatrixMotionTransformBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MatrixMultiplyOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MatrixMultiplyOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MatrixMultiplyOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MatrixMultiplyOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MatrixTransformBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MatrixTransformBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MatrixTransformBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MatrixTransformBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MedianCutSamplerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MedianCutSamplerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MedianCutSamplerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MedianCutSamplerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshDistortionsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshDistortionsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshDistortionsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshDistortionsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshFaceFilterOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshFaceFilterOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshFaceFilterOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshFaceFilterOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshMergeOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshMergeOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshMergeOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshMergeOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshNormalsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshNormalsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshNormalsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshNormalsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveBuilderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveBuilderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveBuilderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveBuilderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshPrimitiveShrinkWrapOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshTangentsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshTangentsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshTangentsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshTangentsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MeshVertexReorderOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MeshVertexReorderOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MeshVertexReorderOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MeshVertexReorderOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MessageHandlerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MessageHandlerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MessageHandlerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MessageHandlerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MixSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ModifyOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ModifyOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ModifyOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ModifyOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MotionPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MotionPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MotionPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MotionPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/MurmurHashBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/MurmurHashBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/MurmurHashBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/MurmurHashBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/NParticleReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/NParticleReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/NParticleReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/NParticleReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/NURBSPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/NURBSPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/NURBSPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/NURBSPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/NormalizeSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/NullObjectBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/NullObjectBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/NullObjectBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/NullObjectBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/NumericParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/NumericParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/NumericParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/NumericParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/OBJReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/OBJReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/OBJReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/OBJReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectBinding.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECorePython/ObjectBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectBinding.cpp index 75a8d271de..de59cff488 100644 --- a/cortex-9.0.0-a6/src/IECorePython/ObjectBinding.cpp +++ b/cortex-9.0.0-a10/src/IECorePython/ObjectBinding.cpp @@ -38,8 +38,10 @@ #include "IECore/Object.h" #include "IECore/MurmurHash.h" + #include "IECorePython/ObjectBinding.h" #include "IECorePython/RunTimeTypedBinding.h" +#include "IECorePython/ScopedGILLock.h" using namespace boost::python; using namespace IECore; @@ -49,6 +51,7 @@ namespace IECorePython static ObjectPtr creator( void *data ) { + IECorePython::ScopedGILLock gilLock; assert( data ); PyObject *d = (PyObject *)(data ); diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectInterpolatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectInterpolatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectInterpolatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectInterpolatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectPoolBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectPoolBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectPoolBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectPoolBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectVectorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectVectorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectVectorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectVectorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ObjectWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ObjectWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ObjectWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ObjectWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/OpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/OpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/OpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/OpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/OptionsBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/OptionsBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/OptionsBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/OptionsBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/OversamplesCalculatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/OversamplesCalculatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/OversamplesCalculatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/OversamplesCalculatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PDCParticleReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PDCParticleReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PDCParticleReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PDCParticleReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PDCParticleWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PDCParticleWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PDCParticleWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PDCParticleWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PNGImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PNGImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PNGImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PNGImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PanalogToLinearOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PanalogToLinearOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PanalogToLinearOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PanalogToLinearOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ParameterisedBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ParameterisedBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ParameterisedBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ParameterisedBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ParameterisedProceduralBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ParameterisedProceduralBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ParameterisedProceduralBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ParameterisedProceduralBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ParticleReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ParticleReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ParticleReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ParticleReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ParticleWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ParticleWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ParticleWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ParticleWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PatchMeshPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PatchMeshPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PatchMeshPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PatchMeshPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PathParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PathParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PathParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PathParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PathVectorParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PathVectorParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PathVectorParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PathVectorParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PerlinNoiseBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PerlinNoiseBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PerlinNoiseBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PerlinNoiseBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointBoundsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointBoundsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointBoundsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointBoundsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointDensitiesOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointDensitiesOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointDensitiesOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointDensitiesOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointDistributionBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointDistributionBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointDistributionBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointDistributionBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointDistributionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointDistributionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointDistributionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointNormalsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointNormalsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointNormalsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointNormalsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointRepulsionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointRepulsionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointRepulsionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointRepulsionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointSmoothSkinningOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointSmoothSkinningOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointSmoothSkinningOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointSmoothSkinningOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointVelocityDisplaceOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointVelocityDisplaceOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointVelocityDisplaceOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointVelocityDisplaceOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointsMotionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointsMotionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointsMotionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointsMotionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointsPrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointsPrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointsPrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointsPrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PointsPrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PolygonAlgoBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PolygonAlgoBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PolygonAlgoBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PolygonAlgoBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PreWorldRenderableBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PreWorldRenderableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PreWorldRenderableBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PreWorldRenderableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PrimitiveOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PrimitiveOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PrimitiveOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PrimitiveOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/PrimitiveVariableBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/PrimitiveVariableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/PrimitiveVariableBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/PrimitiveVariableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RadixSortBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RadixSortBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RadixSortBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RadixSortBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RandomRotationOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RandomRotationOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RandomRotationOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RandomRotationOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/Rec709ToLinearOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/Rec709ToLinearOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/Rec709ToLinearOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/Rec709ToLinearOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RefCountedBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RefCountedBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RefCountedBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RefCountedBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RemoveSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RenderableBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RenderableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RenderableBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RenderableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RendererBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RendererBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RendererBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ReorderSmoothSkinningInfluencesOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ReorderedFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ReorderedFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ReorderedFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ReorderedFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ReversedFrameListBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ReversedFrameListBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ReversedFrameListBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ReversedFrameListBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/RunTimeTypedBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/RunTimeTypedBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/RunTimeTypedBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/RunTimeTypedBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SGIImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SGIImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SGIImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SGIImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SRGBToLinearOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SRGBToLinearOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SRGBToLinearOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SRGBToLinearOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SampledSceneInterfaceBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SampledSceneInterfaceBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SampledSceneInterfaceBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SampledSceneInterfaceBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SceneCacheBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SceneCacheBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SceneCacheBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SceneCacheBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SceneInterfaceBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SceneInterfaceBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SceneInterfaceBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SceneInterfaceBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ScopedGILLock.cpp b/cortex-9.0.0-a10/src/IECorePython/ScopedGILLock.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ScopedGILLock.cpp rename to cortex-9.0.0-a10/src/IECorePython/ScopedGILLock.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ScopedGILRelease.cpp b/cortex-9.0.0-a10/src/IECorePython/ScopedGILRelease.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ScopedGILRelease.cpp rename to cortex-9.0.0-a10/src/IECorePython/ScopedGILRelease.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SearchPathBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SearchPathBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SearchPathBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SearchPathBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ShaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ShaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ShaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ShaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SharedSceneInterfacesBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SharedSceneInterfacesBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SharedSceneInterfacesBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SharedSceneInterfacesBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SimpleTypedDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SimpleTypedDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SimpleTypedDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SimpleTypedDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SimpleTypedParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SimpleTypedParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SimpleTypedParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SimpleTypedParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SmoothSkinningDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SmoothSkinningDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SmoothSkinningDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SmoothSkinningDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SmoothSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SpherePrimitiveBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SpherePrimitiveBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SpherePrimitiveBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SpherePrimitiveBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SpherePrimitiveEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SplineBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SplineBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SplineBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SplineBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SplineDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SplineDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SplineDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SplineDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SplineParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SplineParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SplineParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SplineParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SplineToImageBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SplineToImageBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SplineToImageBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SplineToImageBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/StandardRadialLensModelBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/StandardRadialLensModelBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/StandardRadialLensModelBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/StandardRadialLensModelBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/StateRenderableBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/StateRenderableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/StateRenderableBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/StateRenderableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/SummedAreaOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/SummedAreaOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/SummedAreaOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/SummedAreaOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TGAImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TGAImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TGAImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TGAImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TGAImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TGAImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TGAImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TGAImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TIFFImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TIFFImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TIFFImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TIFFImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TIFFImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TIFFImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TIFFImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TIFFImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimeCodeDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimeCodeDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimeCodeDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimeCodeDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimeCodeParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimeCodeParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimeCodeParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimeCodeParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimeDurationDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimeDurationDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimeDurationDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimeDurationDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimeDurationParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimeDurationParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimeDurationParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimeDurationParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimePeriodBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimePeriodBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimePeriodBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimePeriodBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimePeriodDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimePeriodDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimePeriodDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimePeriodDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimePeriodParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimePeriodParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimePeriodParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimePeriodParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TimerBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TimerBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TimerBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TimerBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ToCoreConverterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ToCoreConverterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ToCoreConverterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ToCoreConverterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TransferSmoothSkinningWeightsOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TransformBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TransformBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TransformBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TransformBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TransformOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TransformOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TransformOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TransformOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TransformationMatrixBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TransformationMatrixBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TransformationMatrixBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TransformationMatrixBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TransformationMatrixDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TransformationMatrixDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TransformationMatrixDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TransformationMatrixDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TriangleAlgoBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TriangleAlgoBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TriangleAlgoBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TriangleAlgoBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TriangulateOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TriangulateOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TriangulateOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TriangulateOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TriangulatorBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TriangulatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TriangulatorBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TriangulatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TurbulenceBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TurbulenceBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TurbulenceBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TurbulenceBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TypeIdBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TypeIdBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TypeIdBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TypeIdBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TypedObjectParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TypedObjectParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TypedObjectParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TypedObjectParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TypedPrimitiveOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TypedPrimitiveOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TypedPrimitiveOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TypedPrimitiveOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/TypedPrimitiveParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/TypedPrimitiveParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/TypedPrimitiveParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/TypedPrimitiveParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/UVDistortOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/UVDistortOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/UVDistortOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/UVDistortOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/UnicodeToStringBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/UnicodeToStringBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/UnicodeToStringBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/UnicodeToStringBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/UniformRandomPointDistributionOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/ValidatedStringParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/ValidatedStringParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/ValidatedStringParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/ValidatedStringParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/VectorDataFilterOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/VectorDataFilterOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/VectorDataFilterOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/VectorDataFilterOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/VectorTypedDataBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/VectorTypedDataBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/VectorTypedDataBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/VectorTypedDataBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/VectorTypedParameterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/VectorTypedParameterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/VectorTypedParameterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/VectorTypedParameterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/VisibleRenderableBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/VisibleRenderableBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/VisibleRenderableBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/VisibleRenderableBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/WarpOpBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/WarpOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/WarpOpBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/WarpOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/WrapperGarbageCollector.cpp b/cortex-9.0.0-a10/src/IECorePython/WrapperGarbageCollector.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/WrapperGarbageCollector.cpp rename to cortex-9.0.0-a10/src/IECorePython/WrapperGarbageCollector.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/WriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/WriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/WriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/WriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePython/YUVImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECorePython/YUVImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePython/YUVImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECorePython/YUVImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECorePythonModule/IECore.cpp b/cortex-9.0.0-a10/src/IECorePythonModule/IECore.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECorePythonModule/IECore.cpp rename to cortex-9.0.0-a10/src/IECorePythonModule/IECore.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/Convert.cpp b/cortex-9.0.0-a10/src/IECoreRI/Convert.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/Convert.cpp rename to cortex-9.0.0-a10/src/IECoreRI/Convert.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/DTEXDeepImageReader.cpp b/cortex-9.0.0-a10/src/IECoreRI/DTEXDeepImageReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/DTEXDeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECoreRI/DTEXDeepImageReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/DTEXDeepImageWriter.cpp b/cortex-9.0.0-a10/src/IECoreRI/DTEXDeepImageWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/DTEXDeepImageWriter.cpp rename to cortex-9.0.0-a10/src/IECoreRI/DTEXDeepImageWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/Dspy.cpp b/cortex-9.0.0-a10/src/IECoreRI/Dspy.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/Dspy.cpp rename to cortex-9.0.0-a10/src/IECoreRI/Dspy.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/GXEvaluator.cpp b/cortex-9.0.0-a10/src/IECoreRI/GXEvaluator.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECoreRI/GXEvaluator.cpp rename to cortex-9.0.0-a10/src/IECoreRI/GXEvaluator.cpp index 287bc07639..cecc618979 100644 --- a/cortex-9.0.0-a6/src/IECoreRI/GXEvaluator.cpp +++ b/cortex-9.0.0-a10/src/IECoreRI/GXEvaluator.cpp @@ -49,7 +49,10 @@ GXEvaluator::GXEvaluator( const IECore::Primitive *primitive ) RiBegin( 0 ); m_context = RiGetContext(); + // create a renderer with automatic instancing disabled, as we want to explicitly create an instanceable object: RendererPtr renderer = new IECoreRI::Renderer(); + renderer->setAttribute( "ri:automaticInstancing", new IECore::BoolData( false ) ); + RtObjectHandle objectHandle = RiObjectBegin(); primitive->render( renderer.get() ); diff --git a/cortex-9.0.0-a6/src/IECoreRI/IECoreRI.cpp b/cortex-9.0.0-a10/src/IECoreRI/IECoreRI.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/IECoreRI.cpp rename to cortex-9.0.0-a10/src/IECoreRI/IECoreRI.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/PTCParticleIO.cpp b/cortex-9.0.0-a10/src/IECoreRI/PTCParticleIO.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/PTCParticleIO.cpp rename to cortex-9.0.0-a10/src/IECoreRI/PTCParticleIO.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/PTCParticleReader.cpp b/cortex-9.0.0-a10/src/IECoreRI/PTCParticleReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/PTCParticleReader.cpp rename to cortex-9.0.0-a10/src/IECoreRI/PTCParticleReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/PTCParticleWriter.cpp b/cortex-9.0.0-a10/src/IECoreRI/PTCParticleWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/PTCParticleWriter.cpp rename to cortex-9.0.0-a10/src/IECoreRI/PTCParticleWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/ParameterList.cpp b/cortex-9.0.0-a10/src/IECoreRI/ParameterList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/ParameterList.cpp rename to cortex-9.0.0-a10/src/IECoreRI/ParameterList.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/PrimitiveVariableList.cpp b/cortex-9.0.0-a10/src/IECoreRI/PrimitiveVariableList.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/PrimitiveVariableList.cpp rename to cortex-9.0.0-a10/src/IECoreRI/PrimitiveVariableList.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/RIBWriter.cpp b/cortex-9.0.0-a10/src/IECoreRI/RIBWriter.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/RIBWriter.cpp rename to cortex-9.0.0-a10/src/IECoreRI/RIBWriter.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/Renderer.cpp b/cortex-9.0.0-a10/src/IECoreRI/Renderer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/Renderer.cpp rename to cortex-9.0.0-a10/src/IECoreRI/Renderer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/RendererImplementation.cpp b/cortex-9.0.0-a10/src/IECoreRI/RendererImplementation.cpp similarity index 98% rename from cortex-9.0.0-a6/src/IECoreRI/RendererImplementation.cpp rename to cortex-9.0.0-a10/src/IECoreRI/RendererImplementation.cpp index aa06b883f3..96c57cf8ef 100644 --- a/cortex-9.0.0-a6/src/IECoreRI/RendererImplementation.cpp +++ b/cortex-9.0.0-a10/src/IECoreRI/RendererImplementation.cpp @@ -89,7 +89,7 @@ std::vector IECoreRI::RendererImplementation::g_nLoops; // This constructor launches a render within the current application. It creates a SharedData instance, // which gets propagated down to the renderers this object creates by launching procedurals. IECoreRI::RendererImplementation::RendererImplementation( const std::string &name ) - : m_sharedData( new SharedData ), m_inWorld( false ) + : m_sharedData( new SharedData ), m_inWorld( false ), m_inEdit( false ) { m_options = new CompoundData(); constructCommon(); @@ -120,7 +120,7 @@ IECoreRI::RendererImplementation::RendererImplementation( const std::string &nam // This constructor gets called in procSubdivide(), and inherits the SharedData from the RendererImplementation // that launched the procedural IECoreRI::RendererImplementation::RendererImplementation( SharedData::Ptr sharedData, IECore::CompoundDataPtr options ) - : m_context( 0 ), m_sharedData( sharedData ), m_options( options ), m_inWorld( true ) + : m_context( 0 ), m_sharedData( sharedData ), m_options( options ), m_inWorld( true ), m_inEdit( false ) { constructCommon(); @@ -144,7 +144,7 @@ IECoreRI::RendererImplementation::RendererImplementation( SharedData::Ptr shared // set m_sharedData to that entry, otherwise we set it to a new SharedData. // IECoreRI::RendererImplementation::RendererImplementation() - : m_context( 0 ), m_options( 0 ), m_inWorld( true ) + : m_context( 0 ), m_options( 0 ), m_inWorld( true ), m_inEdit( false ) { constructCommon(); @@ -425,10 +425,14 @@ void IECoreRI::RendererImplementation::camera( const std::string &name, const IE ConstV2fDataPtr shutterD = runTimeCast( it->second ); RiShutter( shutterD->readable()[0], shutterD->readable()[1] ); - // then resolution + // then format it = camera->parameters().find( "resolution" ); ConstV2iDataPtr d = runTimeCast( it->second ); - RiFormat( d->readable().x, d->readable().y, 1 ); + RiFormat( + d->readable().x, + d->readable().y, + camera->parametersData()->member( "pixelAspectRatio" )->readable() + ); // then screen window it = camera->parameters().find( "screenWindow" ); @@ -482,11 +486,15 @@ void IECoreRI::RendererImplementation::camera( const std::string &name, const IE // then camera itself RiCamera( name.c_str(), RI_NULL ); - if( name == m_lastCamera ) + if( m_inEdit ) { - // we're in an edit, and need to update - // the world camera as well. - RiCamera( RI_WORLD, RI_NULL ); + if( name == m_lastCamera ) + { + // we've just edited the world camera, + // and we have to say explicitly that + // that has happened. + RiCamera( RI_WORLD, RI_NULL ); + } } else { @@ -1252,7 +1260,7 @@ IECore::ConstDataPtr IECoreRI::RendererImplementation::getAutomaticInstancingAtt bool IECoreRI::RendererImplementation::automaticInstancingEnabled() const { - RtInt result = 0; + RtInt result = 1; RxInfoType_t resultType; int resultCount; RxAttribute( "user:cortexAutomaticInstancing", &result, sizeof( RtInt ), &resultType, &resultCount ); @@ -1992,6 +2000,14 @@ struct Serialiser }; +void dynamicLoadFree( void *voidData ) +{ + char **data = (char **)voidData; + free( data[0] ); + free( data[1] ); + free( data ); +}; + } // namespace void IECoreRI::RendererImplementation::externalProcedural( ExternalProcedural *proc ) @@ -2035,9 +2051,9 @@ void IECoreRI::RendererImplementation::externalProcedural( ExternalProcedural *p const std::string dataString = dataStringStream.str(); const char **data = (const char **)malloc( sizeof( char * ) * 2 ); - data[0] = proc->fileName().c_str(); - data[1] = dataString.c_str(); - RiProcedural( data, riBound, RiProcDynamicLoad, RiProcFree ); + data[0] = strdup( proc->fileName().c_str() ); + data[1] = strdup( dataString.c_str() ); + RiProcedural( data, riBound, RiProcDynamicLoad, dynamicLoadFree ); } } @@ -2210,6 +2226,7 @@ void RendererImplementation::editBegin( const std::string &name, const IECore::C RiEditBeginV( name.c_str(), p.n(), p.tokens(), p.values() ); m_inWorld = name != "option"; + m_inEdit = true; } void RendererImplementation::editEnd() @@ -2218,4 +2235,5 @@ void RendererImplementation::editEnd() RiEditEnd(); m_inWorld = false; + m_inEdit = false; } diff --git a/cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageReader.cpp b/cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageReader.cpp similarity index 89% rename from cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageReader.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageReader.cpp index ad6a5e0eb7..7b2b73568b 100644 --- a/cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageReader.cpp +++ b/cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageReader.cpp @@ -227,7 +227,31 @@ bool SHWDeepImageReader::open( bool throwOnFailure ) DtexNl( m_dtexImage, m_worldToCamera.getValue() ); DtexNP( m_dtexImage, m_worldToNDC.getValue() ); - m_NDCToCamera = m_worldToNDC.inverse() * m_worldToCamera; + + // TODO - there should probably be a better way to perform this simple operation in double precision, + // but right now I really just need this to start working, so I'm doing the long version + // ( Plus we can hopefully get rid of this whole thing fairly soon, when 3delight fixes thier depth + // mapping to start with, and/or we throw this out and move to deep exr ) + //m_NDCToCamera = m_worldToNDC.inverse() * m_worldToCamera; + + Imath::M44d worldToCameraDouble; + Imath::M44d worldToNDCDouble; + for( int ix = 0; ix < 4; ix++ ) + { + for( int iy = 0; iy < 4; iy++ ) + { + worldToCameraDouble[ix][iy] = m_worldToCamera[ix][iy]; + worldToNDCDouble[ix][iy] = m_worldToNDC[ix][iy]; + } + } + Imath::M44d NDCToCameraDouble = worldToNDCDouble.inverse() * worldToCameraDouble; + for( int ix = 0; ix < 4; ix++ ) + { + for( int iy = 0; iy < 4; iy++ ) + { + m_NDCToCamera[ix][iy] = NDCToCameraDouble[ix][iy]; + } + } } else { diff --git a/cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageWriter.cpp b/cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageWriter.cpp similarity index 89% rename from cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageWriter.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageWriter.cpp index 59c60f68e3..ac9163b319 100644 --- a/cortex-9.0.0-a6/src/IECoreRI/SHWDeepImageWriter.cpp +++ b/cortex-9.0.0-a10/src/IECoreRI/SHWDeepImageWriter.cpp @@ -199,8 +199,29 @@ void SHWDeepImageWriter::open() float *NL = worldToCameraParameter()->getTypedValue().getValue(); float *NP = worldToNDCParameter()->getTypedValue().getValue(); - - m_NDCToCamera = worldToNDCParameter()->getTypedValue().inverse() * worldToCameraParameter()->getTypedValue(); + // TODO - there should probably be a better way to perform this simple operation in double precision, + // but right now I really just need this to start working, so I'm doing the long version + // ( Plus we can hopefully get rid of this whole thing fairly soon, when 3delight fixes thier depth + // mapping to start with, and/or we throw this out and move to deep exr ) + //m_NDCToCamera = worldToNDCParameter()->getTypedValue().inverse() * worldToCameraParameter()->getTypedValue(); + Imath::M44d worldToCameraDouble; + Imath::M44d worldToNDCDouble; + for( int ix = 0; ix < 4; ix++ ) + { + for( int iy = 0; iy < 4; iy++ ) + { + worldToCameraDouble[ix][iy] = worldToCameraParameter()->getTypedValue()[ix][iy]; + worldToNDCDouble[ix][iy] = worldToNDCParameter()->getTypedValue()[ix][iy]; + } + } + Imath::M44d NDCToCameraDouble = worldToNDCDouble.inverse() * worldToCameraDouble; + for( int ix = 0; ix < 4; ix++ ) + { + for( int iy = 0; iy < 4; iy++ ) + { + m_NDCToCamera[ix][iy] = NDCToCameraDouble[ix][iy]; + } + } /// \todo: does image name mean anything for this format? int status = DtexAddImage( diff --git a/cortex-9.0.0-a6/src/IECoreRI/SLOReader.cpp b/cortex-9.0.0-a10/src/IECoreRI/SLOReader.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/SLOReader.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SLOReader.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/SXExecutor.cpp b/cortex-9.0.0-a10/src/IECoreRI/SXExecutor.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/SXExecutor.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SXExecutor.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/SXRenderer.cpp b/cortex-9.0.0-a10/src/IECoreRI/SXRenderer.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/SXRenderer.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SXRenderer.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/SXRendererImplementation.cpp b/cortex-9.0.0-a10/src/IECoreRI/SXRendererImplementation.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/SXRendererImplementation.cpp rename to cortex-9.0.0-a10/src/IECoreRI/SXRendererImplementation.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/ScopedContext.cpp b/cortex-9.0.0-a10/src/IECoreRI/ScopedContext.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/ScopedContext.cpp rename to cortex-9.0.0-a10/src/IECoreRI/ScopedContext.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/TransformStack.cpp b/cortex-9.0.0-a10/src/IECoreRI/TransformStack.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/TransformStack.cpp rename to cortex-9.0.0-a10/src/IECoreRI/TransformStack.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/DTEXDeepImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/DTEXDeepImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/GXEvaluatorBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/GXEvaluatorBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/GXEvaluatorBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/GXEvaluatorBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/IECoreRIBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/IECoreRIBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/IECoreRIBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/IECoreRIBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/PTCParticleReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/PTCParticleWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/RIBWriterBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/RIBWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/RIBWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/RIBWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/RendererBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/RendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/RendererBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/RendererBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/SHWDeepImageReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/SHWDeepImageWriterBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/SLOReaderBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/SLOReaderBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/SLOReaderBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/SLOReaderBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreRI/bindings/SXRendererBinding.cpp b/cortex-9.0.0-a10/src/IECoreRI/bindings/SXRendererBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreRI/bindings/SXRendererBinding.cpp rename to cortex-9.0.0-a10/src/IECoreRI/bindings/SXRendererBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreTruelight/IECoreTruelight.cpp b/cortex-9.0.0-a10/src/IECoreTruelight/IECoreTruelight.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreTruelight/IECoreTruelight.cpp rename to cortex-9.0.0-a10/src/IECoreTruelight/IECoreTruelight.cpp diff --git a/cortex-9.0.0-a6/src/IECoreTruelight/TruelightColorTransformOp.cpp b/cortex-9.0.0-a10/src/IECoreTruelight/TruelightColorTransformOp.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreTruelight/TruelightColorTransformOp.cpp rename to cortex-9.0.0-a10/src/IECoreTruelight/TruelightColorTransformOp.cpp diff --git a/cortex-9.0.0-a6/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp b/cortex-9.0.0-a10/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp rename to cortex-9.0.0-a10/src/IECoreTruelight/bindings/IECoreTruelightBinding.cpp diff --git a/cortex-9.0.0-a6/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp b/cortex-9.0.0-a10/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp similarity index 100% rename from cortex-9.0.0-a6/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp rename to cortex-9.0.0-a10/src/IECoreTruelight/bindings/TruelightColorTransformOpBinding.cpp diff --git a/cortex-9.0.0-a6/src/rmanDisplays/ieDisplay/IEDisplay.cpp b/cortex-9.0.0-a10/src/rmanDisplays/ieDisplay/IEDisplay.cpp similarity index 100% rename from cortex-9.0.0-a6/src/rmanDisplays/ieDisplay/IEDisplay.cpp rename to cortex-9.0.0-a10/src/rmanDisplays/ieDisplay/IEDisplay.cpp diff --git a/cortex-9.0.0-a6/src/rmanProcedurals/python/Procedural.cpp b/cortex-9.0.0-a10/src/rmanProcedurals/python/Procedural.cpp similarity index 100% rename from cortex-9.0.0-a6/src/rmanProcedurals/python/Procedural.cpp rename to cortex-9.0.0-a10/src/rmanProcedurals/python/Procedural.cpp diff --git a/cortex-9.0.0-a6/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py b/cortex-9.0.0-a10/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py rename to cortex-9.0.0-a10/test/IECore/AddAndRemoveSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/All.py b/cortex-9.0.0-a10/test/IECore/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/All.py rename to cortex-9.0.0-a10/test/IECore/All.py diff --git a/cortex-9.0.0-a6/test/IECore/AngleConversionTest.py b/cortex-9.0.0-a10/test/IECore/AngleConversionTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AngleConversionTest.py rename to cortex-9.0.0-a10/test/IECore/AngleConversionTest.py diff --git a/cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.cpp b/cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.cpp rename to cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.h b/cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.h rename to cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.h diff --git a/cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.inl b/cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AssociatedLegendreTest.inl rename to cortex-9.0.0-a10/test/IECore/AssociatedLegendreTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/AttributeCache.py b/cortex-9.0.0-a10/test/IECore/AttributeCache.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AttributeCache.py rename to cortex-9.0.0-a10/test/IECore/AttributeCache.py diff --git a/cortex-9.0.0-a6/test/IECore/AttributeCacheAllocation.py b/cortex-9.0.0-a10/test/IECore/AttributeCacheAllocation.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AttributeCacheAllocation.py rename to cortex-9.0.0-a10/test/IECore/AttributeCacheAllocation.py diff --git a/cortex-9.0.0-a6/test/IECore/AttributeStateTest.py b/cortex-9.0.0-a10/test/IECore/AttributeStateTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/AttributeStateTest.py rename to cortex-9.0.0-a10/test/IECore/AttributeStateTest.py diff --git a/cortex-9.0.0-a6/test/IECore/BasicPreset.py b/cortex-9.0.0-a10/test/IECore/BasicPreset.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BasicPreset.py rename to cortex-9.0.0-a10/test/IECore/BasicPreset.py diff --git a/cortex-9.0.0-a6/test/IECore/BezierAlgoTest.py b/cortex-9.0.0-a10/test/IECore/BezierAlgoTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BezierAlgoTest.py rename to cortex-9.0.0-a10/test/IECore/BezierAlgoTest.py diff --git a/cortex-9.0.0-a6/test/IECore/BinaryFrameList.py b/cortex-9.0.0-a10/test/IECore/BinaryFrameList.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BinaryFrameList.py rename to cortex-9.0.0-a10/test/IECore/BinaryFrameList.py diff --git a/cortex-9.0.0-a6/test/IECore/BlindDataHolder.py b/cortex-9.0.0-a10/test/IECore/BlindDataHolder.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BlindDataHolder.py rename to cortex-9.0.0-a10/test/IECore/BlindDataHolder.py diff --git a/cortex-9.0.0-a6/test/IECore/BoolVectorData.py b/cortex-9.0.0-a10/test/IECore/BoolVectorData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BoolVectorData.py rename to cortex-9.0.0-a10/test/IECore/BoolVectorData.py diff --git a/cortex-9.0.0-a6/test/IECore/BoostFilesystemPaths.py b/cortex-9.0.0-a10/test/IECore/BoostFilesystemPaths.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BoostFilesystemPaths.py rename to cortex-9.0.0-a10/test/IECore/BoostFilesystemPaths.py diff --git a/cortex-9.0.0-a6/test/IECore/BoostUnitTestTest.cpp b/cortex-9.0.0-a10/test/IECore/BoostUnitTestTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BoostUnitTestTest.cpp rename to cortex-9.0.0-a10/test/IECore/BoostUnitTestTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/BoostUnitTestTest.h b/cortex-9.0.0-a10/test/IECore/BoostUnitTestTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BoostUnitTestTest.h rename to cortex-9.0.0-a10/test/IECore/BoostUnitTestTest.h diff --git a/cortex-9.0.0-a6/test/IECore/BoundedKDTree.py b/cortex-9.0.0-a10/test/IECore/BoundedKDTree.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/BoundedKDTree.py rename to cortex-9.0.0-a10/test/IECore/BoundedKDTree.py diff --git a/cortex-9.0.0-a6/test/IECore/CINImageReader.py b/cortex-9.0.0-a10/test/IECore/CINImageReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CINImageReader.py rename to cortex-9.0.0-a10/test/IECore/CINImageReader.py diff --git a/cortex-9.0.0-a6/test/IECore/CINImageWriter.py b/cortex-9.0.0-a10/test/IECore/CINImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CINImageWriter.py rename to cortex-9.0.0-a10/test/IECore/CINImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/CachedReader.py b/cortex-9.0.0-a10/test/IECore/CachedReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CachedReader.py rename to cortex-9.0.0-a10/test/IECore/CachedReader.py diff --git a/cortex-9.0.0-a6/test/IECore/CamelCaseTest.py b/cortex-9.0.0-a10/test/IECore/CamelCaseTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CamelCaseTest.py rename to cortex-9.0.0-a10/test/IECore/CamelCaseTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Camera.py b/cortex-9.0.0-a10/test/IECore/Camera.py similarity index 93% rename from cortex-9.0.0-a6/test/IECore/Camera.py rename to cortex-9.0.0-a10/test/IECore/Camera.py index 8b5fcb41a2..bf025293ca 100644 --- a/cortex-9.0.0-a6/test/IECore/Camera.py +++ b/cortex-9.0.0-a10/test/IECore/Camera.py @@ -80,6 +80,7 @@ def testAddStandardParameters( self ) : c.addStandardParameters() self.assertEqual( c.parameters()["resolution"].value, V2i( 640, 480 ) ) + self.assertEqual( c.parameters()["pixelAspectRatio"].value, 1.0 ) aspectRatio = 640.0/480.0 self.assertEqual( c.parameters()["screenWindow"].value, Box2f( V2f( -aspectRatio, -1 ), V2f( aspectRatio, 1 ) ) ) @@ -118,6 +119,15 @@ def testHash( self ) : c.addStandardParameters() self.assertNotEqual( c.hash(), h ) + + def testAddStandardParametersWithNonSquarePixels( self ) : + + c = Camera() + c.parameters()["resolution"] = V2i( 100, 200 ) + c.parameters()["pixelAspectRatio"] = 2.0 + + c.addStandardParameters() + self.assertEqual( c.parameters()["screenWindow"].value, Box2f( V2f( -1 ), V2f( 1 ) ) ) def tearDown( self ) : diff --git a/cortex-9.0.0-a6/test/IECore/CameraControllerTest.py b/cortex-9.0.0-a10/test/IECore/CameraControllerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CameraControllerTest.py rename to cortex-9.0.0-a10/test/IECore/CameraControllerTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CapturingMessageHandler.py b/cortex-9.0.0-a10/test/IECore/CapturingMessageHandler.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CapturingMessageHandler.py rename to cortex-9.0.0-a10/test/IECore/CapturingMessageHandler.py diff --git a/cortex-9.0.0-a6/test/IECore/CapturingRendererTest.py b/cortex-9.0.0-a10/test/IECore/CapturingRendererTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CapturingRendererTest.py rename to cortex-9.0.0-a10/test/IECore/CapturingRendererTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ClampOpTest.py b/cortex-9.0.0-a10/test/IECore/ClampOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ClampOpTest.py rename to cortex-9.0.0-a10/test/IECore/ClampOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ClassLoader.py b/cortex-9.0.0-a10/test/IECore/ClassLoader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ClassLoader.py rename to cortex-9.0.0-a10/test/IECore/ClassLoader.py diff --git a/cortex-9.0.0-a6/test/IECore/ClassParameterTest.py b/cortex-9.0.0-a10/test/IECore/ClassParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ClassParameterTest.py rename to cortex-9.0.0-a10/test/IECore/ClassParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ClassVectorParameterTest.py b/cortex-9.0.0-a10/test/IECore/ClassVectorParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ClassVectorParameterTest.py rename to cortex-9.0.0-a10/test/IECore/ClassVectorParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ColorSpaceTransformOpTest.py b/cortex-9.0.0-a10/test/IECore/ColorSpaceTransformOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ColorSpaceTransformOpTest.py rename to cortex-9.0.0-a10/test/IECore/ColorSpaceTransformOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ColorTransformOpTest.py b/cortex-9.0.0-a10/test/IECore/ColorTransformOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ColorTransformOpTest.py rename to cortex-9.0.0-a10/test/IECore/ColorTransformOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ColorTransformTest.cpp b/cortex-9.0.0-a10/test/IECore/ColorTransformTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ColorTransformTest.cpp rename to cortex-9.0.0-a10/test/IECore/ColorTransformTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/ColorTransformTest.h b/cortex-9.0.0-a10/test/IECore/ColorTransformTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ColorTransformTest.h rename to cortex-9.0.0-a10/test/IECore/ColorTransformTest.h diff --git a/cortex-9.0.0-a6/test/IECore/CompilerTest.cpp b/cortex-9.0.0-a10/test/IECore/CompilerTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompilerTest.cpp rename to cortex-9.0.0-a10/test/IECore/CompilerTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/CompilerTest.h b/cortex-9.0.0-a10/test/IECore/CompilerTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompilerTest.h rename to cortex-9.0.0-a10/test/IECore/CompilerTest.h diff --git a/cortex-9.0.0-a6/test/IECore/CompoundData.py b/cortex-9.0.0-a10/test/IECore/CompoundData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundData.py rename to cortex-9.0.0-a10/test/IECore/CompoundData.py diff --git a/cortex-9.0.0-a6/test/IECore/CompoundDataTest.cpp b/cortex-9.0.0-a10/test/IECore/CompoundDataTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundDataTest.cpp rename to cortex-9.0.0-a10/test/IECore/CompoundDataTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/CompoundDataTest.h b/cortex-9.0.0-a10/test/IECore/CompoundDataTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundDataTest.h rename to cortex-9.0.0-a10/test/IECore/CompoundDataTest.h diff --git a/cortex-9.0.0-a6/test/IECore/CompoundObject.py b/cortex-9.0.0-a10/test/IECore/CompoundObject.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundObject.py rename to cortex-9.0.0-a10/test/IECore/CompoundObject.py diff --git a/cortex-9.0.0-a6/test/IECore/CompoundObjectTest.cpp b/cortex-9.0.0-a10/test/IECore/CompoundObjectTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundObjectTest.cpp rename to cortex-9.0.0-a10/test/IECore/CompoundObjectTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/CompoundObjectTest.h b/cortex-9.0.0-a10/test/IECore/CompoundObjectTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundObjectTest.h rename to cortex-9.0.0-a10/test/IECore/CompoundObjectTest.h diff --git a/cortex-9.0.0-a6/test/IECore/CompoundParameterTest.py b/cortex-9.0.0-a10/test/IECore/CompoundParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundParameterTest.py rename to cortex-9.0.0-a10/test/IECore/CompoundParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CompoundVectorParameterTest.py b/cortex-9.0.0-a10/test/IECore/CompoundVectorParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompoundVectorParameterTest.py rename to cortex-9.0.0-a10/test/IECore/CompoundVectorParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py b/cortex-9.0.0-a10/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py rename to cortex-9.0.0-a10/test/IECore/CompressAndDecompressSmoothSkinningDataOpsTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ComputationCacheTest.cpp b/cortex-9.0.0-a10/test/IECore/ComputationCacheTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ComputationCacheTest.cpp rename to cortex-9.0.0-a10/test/IECore/ComputationCacheTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/ComputationCacheTest.h b/cortex-9.0.0-a10/test/IECore/ComputationCacheTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ComputationCacheTest.h rename to cortex-9.0.0-a10/test/IECore/ComputationCacheTest.h diff --git a/cortex-9.0.0-a6/test/IECore/ConfigLoaderTest.py b/cortex-9.0.0-a10/test/IECore/ConfigLoaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ConfigLoaderTest.py rename to cortex-9.0.0-a10/test/IECore/ConfigLoaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ContrastSmoothSkinningWeightsOpTest.py b/cortex-9.0.0-a10/test/IECore/ContrastSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ContrastSmoothSkinningWeightsOpTest.py rename to cortex-9.0.0-a10/test/IECore/ContrastSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CoordinateSystemTest.py b/cortex-9.0.0-a10/test/IECore/CoordinateSystemTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CoordinateSystemTest.py rename to cortex-9.0.0-a10/test/IECore/CoordinateSystemTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CubeColorLookupDataTest.py b/cortex-9.0.0-a10/test/IECore/CubeColorLookupDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CubeColorLookupDataTest.py rename to cortex-9.0.0-a10/test/IECore/CubeColorLookupDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CubeColorLookupTest.py b/cortex-9.0.0-a10/test/IECore/CubeColorLookupTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CubeColorLookupTest.py rename to cortex-9.0.0-a10/test/IECore/CubeColorLookupTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CubeColorTransformOpTest.py b/cortex-9.0.0-a10/test/IECore/CubeColorTransformOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CubeColorTransformOpTest.py rename to cortex-9.0.0-a10/test/IECore/CubeColorTransformOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CubicBasisTest.py b/cortex-9.0.0-a10/test/IECore/CubicBasisTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CubicBasisTest.py rename to cortex-9.0.0-a10/test/IECore/CubicBasisTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Curry.py b/cortex-9.0.0-a10/test/IECore/Curry.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Curry.py rename to cortex-9.0.0-a10/test/IECore/Curry.py diff --git a/cortex-9.0.0-a6/test/IECore/CurveExtrudeOp.py b/cortex-9.0.0-a10/test/IECore/CurveExtrudeOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurveExtrudeOp.py rename to cortex-9.0.0-a10/test/IECore/CurveExtrudeOp.py diff --git a/cortex-9.0.0-a6/test/IECore/CurveLineariserTest.py b/cortex-9.0.0-a10/test/IECore/CurveLineariserTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurveLineariserTest.py rename to cortex-9.0.0-a10/test/IECore/CurveLineariserTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CurveTangentsOpTest.py b/cortex-9.0.0-a10/test/IECore/CurveTangentsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurveTangentsOpTest.py rename to cortex-9.0.0-a10/test/IECore/CurveTangentsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CurveTracerTest.py b/cortex-9.0.0-a10/test/IECore/CurveTracerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurveTracerTest.py rename to cortex-9.0.0-a10/test/IECore/CurveTracerTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CurvesMergeOpTest.py b/cortex-9.0.0-a10/test/IECore/CurvesMergeOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurvesMergeOpTest.py rename to cortex-9.0.0-a10/test/IECore/CurvesMergeOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorTest.py b/cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorTest.py rename to cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorTest.py diff --git a/cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp b/cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp rename to cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h b/cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h rename to cortex-9.0.0-a10/test/IECore/CurvesPrimitiveEvaluatorThreadingTest.h diff --git a/cortex-9.0.0-a6/test/IECore/CurvesPrimitiveTest.py b/cortex-9.0.0-a10/test/IECore/CurvesPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/CurvesPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECore/CurvesPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DPXImageReader.py b/cortex-9.0.0-a10/test/IECore/DPXImageReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DPXImageReader.py rename to cortex-9.0.0-a10/test/IECore/DPXImageReader.py diff --git a/cortex-9.0.0-a6/test/IECore/DPXImageWriter.py b/cortex-9.0.0-a10/test/IECore/DPXImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DPXImageWriter.py rename to cortex-9.0.0-a10/test/IECore/DPXImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/DataCastOp.py b/cortex-9.0.0-a10/test/IECore/DataCastOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataCastOp.py rename to cortex-9.0.0-a10/test/IECore/DataCastOp.py diff --git a/cortex-9.0.0-a6/test/IECore/DataConversionTest.cpp b/cortex-9.0.0-a10/test/IECore/DataConversionTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataConversionTest.cpp rename to cortex-9.0.0-a10/test/IECore/DataConversionTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/DataConversionTest.h b/cortex-9.0.0-a10/test/IECore/DataConversionTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataConversionTest.h rename to cortex-9.0.0-a10/test/IECore/DataConversionTest.h diff --git a/cortex-9.0.0-a6/test/IECore/DataConvertOpTest.py b/cortex-9.0.0-a10/test/IECore/DataConvertOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataConvertOpTest.py rename to cortex-9.0.0-a10/test/IECore/DataConvertOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DataConvertTest.cpp b/cortex-9.0.0-a10/test/IECore/DataConvertTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataConvertTest.cpp rename to cortex-9.0.0-a10/test/IECore/DataConvertTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/DataConvertTest.h b/cortex-9.0.0-a10/test/IECore/DataConvertTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataConvertTest.h rename to cortex-9.0.0-a10/test/IECore/DataConvertTest.h diff --git a/cortex-9.0.0-a6/test/IECore/DataInterleaveOpTest.py b/cortex-9.0.0-a10/test/IECore/DataInterleaveOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataInterleaveOpTest.py rename to cortex-9.0.0-a10/test/IECore/DataInterleaveOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DataPromoteOp.py b/cortex-9.0.0-a10/test/IECore/DataPromoteOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataPromoteOp.py rename to cortex-9.0.0-a10/test/IECore/DataPromoteOp.py diff --git a/cortex-9.0.0-a6/test/IECore/DataTraitsTest.py b/cortex-9.0.0-a10/test/IECore/DataTraitsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DataTraitsTest.py rename to cortex-9.0.0-a10/test/IECore/DataTraitsTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DateTimeDataTest.py b/cortex-9.0.0-a10/test/IECore/DateTimeDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DateTimeDataTest.py rename to cortex-9.0.0-a10/test/IECore/DateTimeDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DateTimeParameterTest.py b/cortex-9.0.0-a10/test/IECore/DateTimeParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DateTimeParameterTest.py rename to cortex-9.0.0-a10/test/IECore/DateTimeParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DeepPixelTest.py b/cortex-9.0.0-a10/test/IECore/DeepPixelTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DeepPixelTest.py rename to cortex-9.0.0-a10/test/IECore/DeepPixelTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DespatchTypedDataTest.cpp b/cortex-9.0.0-a10/test/IECore/DespatchTypedDataTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DespatchTypedDataTest.cpp rename to cortex-9.0.0-a10/test/IECore/DespatchTypedDataTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/DespatchTypedDataTest.h b/cortex-9.0.0-a10/test/IECore/DespatchTypedDataTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DespatchTypedDataTest.h rename to cortex-9.0.0-a10/test/IECore/DespatchTypedDataTest.h diff --git a/cortex-9.0.0-a6/test/IECore/DiskPrimitiveTest.py b/cortex-9.0.0-a10/test/IECore/DiskPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DiskPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECore/DiskPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DisplayDriverTest.py b/cortex-9.0.0-a10/test/IECore/DisplayDriverTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DisplayDriverTest.py rename to cortex-9.0.0-a10/test/IECore/DisplayDriverTest.py diff --git a/cortex-9.0.0-a6/test/IECore/DisplayTest.py b/cortex-9.0.0-a10/test/IECore/DisplayTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/DisplayTest.py rename to cortex-9.0.0-a10/test/IECore/DisplayTest.py diff --git a/cortex-9.0.0-a6/test/IECore/EXRDeepImageReaderTest.py b/cortex-9.0.0-a10/test/IECore/EXRDeepImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/EXRDeepImageReaderTest.py rename to cortex-9.0.0-a10/test/IECore/EXRDeepImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/EXRDeepImageWriterTest.py b/cortex-9.0.0-a10/test/IECore/EXRDeepImageWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/EXRDeepImageWriterTest.py rename to cortex-9.0.0-a10/test/IECore/EXRDeepImageWriterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/EXRImageReader.py b/cortex-9.0.0-a10/test/IECore/EXRImageReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/EXRImageReader.py rename to cortex-9.0.0-a10/test/IECore/EXRImageReader.py diff --git a/cortex-9.0.0-a6/test/IECore/EXRImageWriter.py b/cortex-9.0.0-a10/test/IECore/EXRImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/EXRImageWriter.py rename to cortex-9.0.0-a10/test/IECore/EXRImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/Enum.py b/cortex-9.0.0-a10/test/IECore/Enum.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Enum.py rename to cortex-9.0.0-a10/test/IECore/Enum.py diff --git a/cortex-9.0.0-a6/test/IECore/EnvMapSamplerTest.py b/cortex-9.0.0-a10/test/IECore/EnvMapSamplerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/EnvMapSamplerTest.py rename to cortex-9.0.0-a10/test/IECore/EnvMapSamplerTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ExclusionFrameList.py b/cortex-9.0.0-a10/test/IECore/ExclusionFrameList.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ExclusionFrameList.py rename to cortex-9.0.0-a10/test/IECore/ExclusionFrameList.py diff --git a/cortex-9.0.0-a6/test/IECore/ExternalProceduralTest.py b/cortex-9.0.0-a10/test/IECore/ExternalProceduralTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ExternalProceduralTest.py rename to cortex-9.0.0-a10/test/IECore/ExternalProceduralTest.py diff --git a/cortex-9.0.0-a6/test/IECore/FaceAreaOpTest.py b/cortex-9.0.0-a10/test/IECore/FaceAreaOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FaceAreaOpTest.py rename to cortex-9.0.0-a10/test/IECore/FaceAreaOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/FaceVaryingPromotionOpTest.py b/cortex-9.0.0-a10/test/IECore/FaceVaryingPromotionOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FaceVaryingPromotionOpTest.py rename to cortex-9.0.0-a10/test/IECore/FaceVaryingPromotionOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/FileExaminer.py b/cortex-9.0.0-a10/test/IECore/FileExaminer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FileExaminer.py rename to cortex-9.0.0-a10/test/IECore/FileExaminer.py diff --git a/cortex-9.0.0-a6/test/IECore/FileSequence.py b/cortex-9.0.0-a10/test/IECore/FileSequence.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FileSequence.py rename to cortex-9.0.0-a10/test/IECore/FileSequence.py diff --git a/cortex-9.0.0-a6/test/IECore/FileSequenceParameter.py b/cortex-9.0.0-a10/test/IECore/FileSequenceParameter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FileSequenceParameter.py rename to cortex-9.0.0-a10/test/IECore/FileSequenceParameter.py diff --git a/cortex-9.0.0-a6/test/IECore/FileSequenceVectorParameter.py b/cortex-9.0.0-a10/test/IECore/FileSequenceVectorParameter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FileSequenceVectorParameter.py rename to cortex-9.0.0-a10/test/IECore/FileSequenceVectorParameter.py diff --git a/cortex-9.0.0-a6/test/IECore/FontTest.py b/cortex-9.0.0-a10/test/IECore/FontTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FontTest.py rename to cortex-9.0.0-a10/test/IECore/FontTest.py diff --git a/cortex-9.0.0-a6/test/IECore/FormattedParameterHelp.py b/cortex-9.0.0-a10/test/IECore/FormattedParameterHelp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FormattedParameterHelp.py rename to cortex-9.0.0-a10/test/IECore/FormattedParameterHelp.py diff --git a/cortex-9.0.0-a6/test/IECore/FrameList.py b/cortex-9.0.0-a10/test/IECore/FrameList.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FrameList.py rename to cortex-9.0.0-a10/test/IECore/FrameList.py diff --git a/cortex-9.0.0-a6/test/IECore/FrameListParameter.py b/cortex-9.0.0-a10/test/IECore/FrameListParameter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/FrameListParameter.py rename to cortex-9.0.0-a10/test/IECore/FrameListParameter.py diff --git a/cortex-9.0.0-a6/test/IECore/GenericImageTest.py b/cortex-9.0.0-a10/test/IECore/GenericImageTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/GenericImageTest.py rename to cortex-9.0.0-a10/test/IECore/GenericImageTest.py diff --git a/cortex-9.0.0-a6/test/IECore/GradeTest.py b/cortex-9.0.0-a10/test/IECore/GradeTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/GradeTest.py rename to cortex-9.0.0-a10/test/IECore/GradeTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Group.py b/cortex-9.0.0-a10/test/IECore/Group.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Group.py rename to cortex-9.0.0-a10/test/IECore/Group.py diff --git a/cortex-9.0.0-a6/test/IECore/HeaderGenerator.py b/cortex-9.0.0-a10/test/IECore/HeaderGenerator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/HeaderGenerator.py rename to cortex-9.0.0-a10/test/IECore/HeaderGenerator.py diff --git a/cortex-9.0.0-a6/test/IECore/HexConversionTest.py b/cortex-9.0.0-a10/test/IECore/HexConversionTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/HexConversionTest.py rename to cortex-9.0.0-a10/test/IECore/HexConversionTest.py diff --git a/cortex-9.0.0-a6/test/IECore/HitMissTransformTest.py b/cortex-9.0.0-a10/test/IECore/HitMissTransformTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/HitMissTransformTest.py rename to cortex-9.0.0-a10/test/IECore/HitMissTransformTest.py diff --git a/cortex-9.0.0-a6/test/IECore/IDXReaderTest.py b/cortex-9.0.0-a10/test/IECore/IDXReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IDXReaderTest.py rename to cortex-9.0.0-a10/test/IECore/IDXReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/IECoreTest.cpp b/cortex-9.0.0-a10/test/IECore/IECoreTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IECoreTest.cpp rename to cortex-9.0.0-a10/test/IECore/IECoreTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/IgnoredExceptionsTest.py b/cortex-9.0.0-a10/test/IECore/IgnoredExceptionsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IgnoredExceptionsTest.py rename to cortex-9.0.0-a10/test/IECore/IgnoredExceptionsTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageCompositeOpTest.py b/cortex-9.0.0-a10/test/IECore/ImageCompositeOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageCompositeOpTest.py rename to cortex-9.0.0-a10/test/IECore/ImageCompositeOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageConvolveOpTest.py b/cortex-9.0.0-a10/test/IECore/ImageConvolveOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageConvolveOpTest.py rename to cortex-9.0.0-a10/test/IECore/ImageConvolveOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageCropOp.py b/cortex-9.0.0-a10/test/IECore/ImageCropOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageCropOp.py rename to cortex-9.0.0-a10/test/IECore/ImageCropOp.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageDiffOp.py b/cortex-9.0.0-a10/test/IECore/ImageDiffOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageDiffOp.py rename to cortex-9.0.0-a10/test/IECore/ImageDiffOp.py diff --git a/cortex-9.0.0-a6/test/IECore/ImagePremultiplyOpTest.py b/cortex-9.0.0-a10/test/IECore/ImagePremultiplyOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImagePremultiplyOpTest.py rename to cortex-9.0.0-a10/test/IECore/ImagePremultiplyOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImagePrimitive.py b/cortex-9.0.0-a10/test/IECore/ImagePrimitive.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImagePrimitive.py rename to cortex-9.0.0-a10/test/IECore/ImagePrimitive.py diff --git a/cortex-9.0.0-a6/test/IECore/ImagePrimitiveEvaluator.py b/cortex-9.0.0-a10/test/IECore/ImagePrimitiveEvaluator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImagePrimitiveEvaluator.py rename to cortex-9.0.0-a10/test/IECore/ImagePrimitiveEvaluator.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageSequenceCompositeOpTest.py b/cortex-9.0.0-a10/test/IECore/ImageSequenceCompositeOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageSequenceCompositeOpTest.py rename to cortex-9.0.0-a10/test/IECore/ImageSequenceCompositeOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageTests.py b/cortex-9.0.0-a10/test/IECore/ImageTests.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageTests.py rename to cortex-9.0.0-a10/test/IECore/ImageTests.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageThinnerTest.py b/cortex-9.0.0-a10/test/IECore/ImageThinnerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageThinnerTest.py rename to cortex-9.0.0-a10/test/IECore/ImageThinnerTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImageUnpremultiplyOpTest.py b/cortex-9.0.0-a10/test/IECore/ImageUnpremultiplyOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImageUnpremultiplyOpTest.py rename to cortex-9.0.0-a10/test/IECore/ImageUnpremultiplyOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Imath.py b/cortex-9.0.0-a10/test/IECore/Imath.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Imath.py rename to cortex-9.0.0-a10/test/IECore/Imath.py diff --git a/cortex-9.0.0-a6/test/IECore/ImathRootsTest.py b/cortex-9.0.0-a10/test/IECore/ImathRootsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImathRootsTest.py rename to cortex-9.0.0-a10/test/IECore/ImathRootsTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ImathVectorData.py b/cortex-9.0.0-a10/test/IECore/ImathVectorData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImathVectorData.py rename to cortex-9.0.0-a10/test/IECore/ImathVectorData.py diff --git a/cortex-9.0.0-a6/test/IECore/ImfTest.py b/cortex-9.0.0-a10/test/IECore/ImfTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ImfTest.py rename to cortex-9.0.0-a10/test/IECore/ImfTest.py diff --git a/cortex-9.0.0-a6/test/IECore/IndexedIO.py b/cortex-9.0.0-a10/test/IECore/IndexedIO.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IndexedIO.py rename to cortex-9.0.0-a10/test/IECore/IndexedIO.py diff --git a/cortex-9.0.0-a6/test/IECore/IndexedIOTest.cpp b/cortex-9.0.0-a10/test/IECore/IndexedIOTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IndexedIOTest.cpp rename to cortex-9.0.0-a10/test/IECore/IndexedIOTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/IndexedIOTest.h b/cortex-9.0.0-a10/test/IECore/IndexedIOTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/IndexedIOTest.h rename to cortex-9.0.0-a10/test/IECore/IndexedIOTest.h diff --git a/cortex-9.0.0-a6/test/IECore/InternedStringTest.cpp b/cortex-9.0.0-a10/test/IECore/InternedStringTest.cpp similarity index 84% rename from cortex-9.0.0-a6/test/IECore/InternedStringTest.cpp rename to cortex-9.0.0-a10/test/IECore/InternedStringTest.cpp index 98f97f6dd0..4f6a30989c 100644 --- a/cortex-9.0.0-a6/test/IECore/InternedStringTest.cpp +++ b/cortex-9.0.0-a10/test/IECore/InternedStringTest.cpp @@ -79,6 +79,22 @@ struct InternedStringTest size_t numIterations = 10000000; parallel_for( blocked_range( 0, numIterations ), Constructor() ); } + + void testRangeConstruction() + { + + const char *aa = "aa"; + const char *aabb = "aabb"; + const char *aabbaa = "aabbaa"; + + BOOST_CHECK_EQUAL( InternedString( aa ), InternedString( aa, 2 ) ); + BOOST_CHECK_EQUAL( InternedString( aa, 2 ), InternedString( aa, 2 ) ); + BOOST_CHECK_EQUAL( InternedString( aa, 1 ), InternedString( aa, 1 ) ); + BOOST_CHECK_EQUAL( InternedString( aa, 2 ), InternedString( aabb, 2 ) ); + BOOST_CHECK_EQUAL( InternedString( aabb ), InternedString( aabbaa, 4 ) ); + + }; + }; @@ -90,6 +106,7 @@ struct InternedStringTestSuite : public boost::unit_test::test_suite boost::shared_ptr instance( new InternedStringTest() ); add( BOOST_CLASS_TEST_CASE( &InternedStringTest::testConcurrentConstruction, instance ) ); + add( BOOST_CLASS_TEST_CASE( &InternedStringTest::testRangeConstruction, instance ) ); } }; diff --git a/cortex-9.0.0-a6/test/IECore/InternedStringTest.h b/cortex-9.0.0-a10/test/IECore/InternedStringTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InternedStringTest.h rename to cortex-9.0.0-a10/test/IECore/InternedStringTest.h diff --git a/cortex-9.0.0-a6/test/IECore/InternedStringTest.py b/cortex-9.0.0-a10/test/IECore/InternedStringTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InternedStringTest.py rename to cortex-9.0.0-a10/test/IECore/InternedStringTest.py diff --git a/cortex-9.0.0-a6/test/IECore/InterpolatedCache.py b/cortex-9.0.0-a10/test/IECore/InterpolatedCache.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InterpolatedCache.py rename to cortex-9.0.0-a10/test/IECore/InterpolatedCache.py diff --git a/cortex-9.0.0-a6/test/IECore/InterpolatedCacheIssue.py b/cortex-9.0.0-a10/test/IECore/InterpolatedCacheIssue.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InterpolatedCacheIssue.py rename to cortex-9.0.0-a10/test/IECore/InterpolatedCacheIssue.py diff --git a/cortex-9.0.0-a6/test/IECore/InterpolatorTest.cpp b/cortex-9.0.0-a10/test/IECore/InterpolatorTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InterpolatorTest.cpp rename to cortex-9.0.0-a10/test/IECore/InterpolatorTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/InterpolatorTest.h b/cortex-9.0.0-a10/test/IECore/InterpolatorTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InterpolatorTest.h rename to cortex-9.0.0-a10/test/IECore/InterpolatorTest.h diff --git a/cortex-9.0.0-a6/test/IECore/InterpolatorTest.inl b/cortex-9.0.0-a10/test/IECore/InterpolatorTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InterpolatorTest.inl rename to cortex-9.0.0-a10/test/IECore/InterpolatorTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/InverseDistanceWeightedInterpolation.py b/cortex-9.0.0-a10/test/IECore/InverseDistanceWeightedInterpolation.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/InverseDistanceWeightedInterpolation.py rename to cortex-9.0.0-a10/test/IECore/InverseDistanceWeightedInterpolation.py diff --git a/cortex-9.0.0-a6/test/IECore/Issues.py b/cortex-9.0.0-a10/test/IECore/Issues.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Issues.py rename to cortex-9.0.0-a10/test/IECore/Issues.py diff --git a/cortex-9.0.0-a6/test/IECore/JPEGImageReader.py b/cortex-9.0.0-a10/test/IECore/JPEGImageReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/JPEGImageReader.py rename to cortex-9.0.0-a10/test/IECore/JPEGImageReader.py diff --git a/cortex-9.0.0-a6/test/IECore/JPEGImageWriter.py b/cortex-9.0.0-a10/test/IECore/JPEGImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/JPEGImageWriter.py rename to cortex-9.0.0-a10/test/IECore/JPEGImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/KDTree.py b/cortex-9.0.0-a10/test/IECore/KDTree.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/KDTree.py rename to cortex-9.0.0-a10/test/IECore/KDTree.py diff --git a/cortex-9.0.0-a6/test/IECore/KDTreeTest.cpp b/cortex-9.0.0-a10/test/IECore/KDTreeTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/KDTreeTest.cpp rename to cortex-9.0.0-a10/test/IECore/KDTreeTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/KDTreeTest.h b/cortex-9.0.0-a10/test/IECore/KDTreeTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/KDTreeTest.h rename to cortex-9.0.0-a10/test/IECore/KDTreeTest.h diff --git a/cortex-9.0.0-a6/test/IECore/KDTreeTest.inl b/cortex-9.0.0-a10/test/IECore/KDTreeTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/KDTreeTest.inl rename to cortex-9.0.0-a10/test/IECore/KDTreeTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/LRUCacheTest.py b/cortex-9.0.0-a10/test/IECore/LRUCacheTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LRUCacheTest.py rename to cortex-9.0.0-a10/test/IECore/LRUCacheTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LRUCacheThreadingTest.cpp b/cortex-9.0.0-a10/test/IECore/LRUCacheThreadingTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LRUCacheThreadingTest.cpp rename to cortex-9.0.0-a10/test/IECore/LRUCacheThreadingTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/LRUCacheThreadingTest.h b/cortex-9.0.0-a10/test/IECore/LRUCacheThreadingTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LRUCacheThreadingTest.h rename to cortex-9.0.0-a10/test/IECore/LRUCacheThreadingTest.h diff --git a/cortex-9.0.0-a6/test/IECore/LayeredDictTest.py b/cortex-9.0.0-a10/test/IECore/LayeredDictTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LayeredDictTest.py rename to cortex-9.0.0-a10/test/IECore/LayeredDictTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LensDistortOpTest.py b/cortex-9.0.0-a10/test/IECore/LensDistortOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LensDistortOpTest.py rename to cortex-9.0.0-a10/test/IECore/LensDistortOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.cpp b/cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.cpp rename to cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.h b/cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.h rename to cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.h diff --git a/cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.inl b/cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.inl rename to cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.py b/cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LevenbergMarquardtTest.py rename to cortex-9.0.0-a10/test/IECore/LevenbergMarquardtTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LightTest.py b/cortex-9.0.0-a10/test/IECore/LightTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LightTest.py rename to cortex-9.0.0-a10/test/IECore/LightTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LimitSmoothSkinningInfluencesOpTest.py b/cortex-9.0.0-a10/test/IECore/LimitSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LimitSmoothSkinningInfluencesOpTest.py rename to cortex-9.0.0-a10/test/IECore/LimitSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LineSegmentTest.py b/cortex-9.0.0-a10/test/IECore/LineSegmentTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LineSegmentTest.py rename to cortex-9.0.0-a10/test/IECore/LineSegmentTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LinkedSceneTest.py b/cortex-9.0.0-a10/test/IECore/LinkedSceneTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LinkedSceneTest.py rename to cortex-9.0.0-a10/test/IECore/LinkedSceneTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LookupTest.cpp b/cortex-9.0.0-a10/test/IECore/LookupTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LookupTest.cpp rename to cortex-9.0.0-a10/test/IECore/LookupTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/LookupTest.h b/cortex-9.0.0-a10/test/IECore/LookupTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LookupTest.h rename to cortex-9.0.0-a10/test/IECore/LookupTest.h diff --git a/cortex-9.0.0-a6/test/IECore/LookupTest.py b/cortex-9.0.0-a10/test/IECore/LookupTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LookupTest.py rename to cortex-9.0.0-a10/test/IECore/LookupTest.py diff --git a/cortex-9.0.0-a6/test/IECore/LuminanceOpTest.py b/cortex-9.0.0-a10/test/IECore/LuminanceOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/LuminanceOpTest.py rename to cortex-9.0.0-a10/test/IECore/LuminanceOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MappedRandomPointDistributionOpTest.py b/cortex-9.0.0-a10/test/IECore/MappedRandomPointDistributionOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MappedRandomPointDistributionOpTest.py rename to cortex-9.0.0-a10/test/IECore/MappedRandomPointDistributionOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MarschnerLookupTableOpTest.py b/cortex-9.0.0-a10/test/IECore/MarschnerLookupTableOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MarschnerLookupTableOpTest.py rename to cortex-9.0.0-a10/test/IECore/MarschnerLookupTableOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Math.py b/cortex-9.0.0-a10/test/IECore/Math.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Math.py rename to cortex-9.0.0-a10/test/IECore/Math.py diff --git a/cortex-9.0.0-a6/test/IECore/MatrixMultiplyOp.py b/cortex-9.0.0-a10/test/IECore/MatrixMultiplyOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MatrixMultiplyOp.py rename to cortex-9.0.0-a10/test/IECore/MatrixMultiplyOp.py diff --git a/cortex-9.0.0-a6/test/IECore/MedianCutSamplerTest.py b/cortex-9.0.0-a10/test/IECore/MedianCutSamplerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MedianCutSamplerTest.py rename to cortex-9.0.0-a10/test/IECore/MedianCutSamplerTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MemoryUsage.py b/cortex-9.0.0-a10/test/IECore/MemoryUsage.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MemoryUsage.py rename to cortex-9.0.0-a10/test/IECore/MemoryUsage.py diff --git a/cortex-9.0.0-a6/test/IECore/Menus.py b/cortex-9.0.0-a10/test/IECore/Menus.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Menus.py rename to cortex-9.0.0-a10/test/IECore/Menus.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshDistortionsOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshDistortionsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshDistortionsOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshDistortionsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshFaceFilterOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshFaceFilterOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshFaceFilterOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshFaceFilterOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshMergeOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshMergeOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshMergeOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshMergeOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshNormalsOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshNormalsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshNormalsOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshNormalsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshPrimitive.py b/cortex-9.0.0-a10/test/IECore/MeshPrimitive.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshPrimitive.py rename to cortex-9.0.0-a10/test/IECore/MeshPrimitive.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshPrimitiveEvaluator.py b/cortex-9.0.0-a10/test/IECore/MeshPrimitiveEvaluator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshPrimitiveEvaluator.py rename to cortex-9.0.0-a10/test/IECore/MeshPrimitiveEvaluator.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshPrimitiveShrinkWrapOp.py b/cortex-9.0.0-a10/test/IECore/MeshPrimitiveShrinkWrapOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshPrimitiveShrinkWrapOp.py rename to cortex-9.0.0-a10/test/IECore/MeshPrimitiveShrinkWrapOp.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshTangentsOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshTangentsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshTangentsOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshTangentsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MeshVertexReorderOpTest.py b/cortex-9.0.0-a10/test/IECore/MeshVertexReorderOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MeshVertexReorderOpTest.py rename to cortex-9.0.0-a10/test/IECore/MeshVertexReorderOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MessageHandler.py b/cortex-9.0.0-a10/test/IECore/MessageHandler.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MessageHandler.py rename to cortex-9.0.0-a10/test/IECore/MessageHandler.py diff --git a/cortex-9.0.0-a6/test/IECore/MixSmoothSkinningWeightsOpTest.py b/cortex-9.0.0-a10/test/IECore/MixSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MixSmoothSkinningWeightsOpTest.py rename to cortex-9.0.0-a10/test/IECore/MixSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/MotionPrimitive.py b/cortex-9.0.0-a10/test/IECore/MotionPrimitive.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MotionPrimitive.py rename to cortex-9.0.0-a10/test/IECore/MotionPrimitive.py diff --git a/cortex-9.0.0-a6/test/IECore/MurmurHashTest.py b/cortex-9.0.0-a10/test/IECore/MurmurHashTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/MurmurHashTest.py rename to cortex-9.0.0-a10/test/IECore/MurmurHashTest.py diff --git a/cortex-9.0.0-a6/test/IECore/NParticleReader.py b/cortex-9.0.0-a10/test/IECore/NParticleReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/NParticleReader.py rename to cortex-9.0.0-a10/test/IECore/NParticleReader.py diff --git a/cortex-9.0.0-a6/test/IECore/NURBS.py b/cortex-9.0.0-a10/test/IECore/NURBS.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/NURBS.py rename to cortex-9.0.0-a10/test/IECore/NURBS.py diff --git a/cortex-9.0.0-a6/test/IECore/NamespacePollution.py b/cortex-9.0.0-a10/test/IECore/NamespacePollution.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/NamespacePollution.py rename to cortex-9.0.0-a10/test/IECore/NamespacePollution.py diff --git a/cortex-9.0.0-a6/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py b/cortex-9.0.0-a10/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py rename to cortex-9.0.0-a10/test/IECore/NormalizeSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/NullObjectTest.py b/cortex-9.0.0-a10/test/IECore/NullObjectTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/NullObjectTest.py rename to cortex-9.0.0-a10/test/IECore/NullObjectTest.py diff --git a/cortex-9.0.0-a6/test/IECore/OBJReaderTest.py b/cortex-9.0.0-a10/test/IECore/OBJReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/OBJReaderTest.py rename to cortex-9.0.0-a10/test/IECore/OBJReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Object.py b/cortex-9.0.0-a10/test/IECore/Object.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Object.py rename to cortex-9.0.0-a10/test/IECore/Object.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectIO.py b/cortex-9.0.0-a10/test/IECore/ObjectIO.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectIO.py rename to cortex-9.0.0-a10/test/IECore/ObjectIO.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectInterpolation.py b/cortex-9.0.0-a10/test/IECore/ObjectInterpolation.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectInterpolation.py rename to cortex-9.0.0-a10/test/IECore/ObjectInterpolation.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectPoolTest.py b/cortex-9.0.0-a10/test/IECore/ObjectPoolTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectPoolTest.py rename to cortex-9.0.0-a10/test/IECore/ObjectPoolTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectReader.py b/cortex-9.0.0-a10/test/IECore/ObjectReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectReader.py rename to cortex-9.0.0-a10/test/IECore/ObjectReader.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectVectorTest.py b/cortex-9.0.0-a10/test/IECore/ObjectVectorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectVectorTest.py rename to cortex-9.0.0-a10/test/IECore/ObjectVectorTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ObjectWriter.py b/cortex-9.0.0-a10/test/IECore/ObjectWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ObjectWriter.py rename to cortex-9.0.0-a10/test/IECore/ObjectWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/Op.py b/cortex-9.0.0-a10/test/IECore/Op.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Op.py rename to cortex-9.0.0-a10/test/IECore/Op.py diff --git a/cortex-9.0.0-a6/test/IECore/OptionalCompoundParameter.py b/cortex-9.0.0-a10/test/IECore/OptionalCompoundParameter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/OptionalCompoundParameter.py rename to cortex-9.0.0-a10/test/IECore/OptionalCompoundParameter.py diff --git a/cortex-9.0.0-a6/test/IECore/OptionsTest.py b/cortex-9.0.0-a10/test/IECore/OptionsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/OptionsTest.py rename to cortex-9.0.0-a10/test/IECore/OptionsTest.py diff --git a/cortex-9.0.0-a6/test/IECore/OversamplesCalculatorTest.py b/cortex-9.0.0-a10/test/IECore/OversamplesCalculatorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/OversamplesCalculatorTest.py rename to cortex-9.0.0-a10/test/IECore/OversamplesCalculatorTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PDCReader.py b/cortex-9.0.0-a10/test/IECore/PDCReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PDCReader.py rename to cortex-9.0.0-a10/test/IECore/PDCReader.py diff --git a/cortex-9.0.0-a6/test/IECore/PDCWriter.py b/cortex-9.0.0-a10/test/IECore/PDCWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PDCWriter.py rename to cortex-9.0.0-a10/test/IECore/PDCWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/PNGImageReader.py b/cortex-9.0.0-a10/test/IECore/PNGImageReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PNGImageReader.py rename to cortex-9.0.0-a10/test/IECore/PNGImageReader.py diff --git a/cortex-9.0.0-a6/test/IECore/ParameterAlgoTest.py b/cortex-9.0.0-a10/test/IECore/ParameterAlgoTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ParameterAlgoTest.py rename to cortex-9.0.0-a10/test/IECore/ParameterAlgoTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ParameterParser.py b/cortex-9.0.0-a10/test/IECore/ParameterParser.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ParameterParser.py rename to cortex-9.0.0-a10/test/IECore/ParameterParser.py diff --git a/cortex-9.0.0-a6/test/IECore/ParameterThreadingTest.cpp b/cortex-9.0.0-a10/test/IECore/ParameterThreadingTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ParameterThreadingTest.cpp rename to cortex-9.0.0-a10/test/IECore/ParameterThreadingTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/ParameterThreadingTest.h b/cortex-9.0.0-a10/test/IECore/ParameterThreadingTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ParameterThreadingTest.h rename to cortex-9.0.0-a10/test/IECore/ParameterThreadingTest.h diff --git a/cortex-9.0.0-a6/test/IECore/Parameterised.py b/cortex-9.0.0-a10/test/IECore/Parameterised.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Parameterised.py rename to cortex-9.0.0-a10/test/IECore/Parameterised.py diff --git a/cortex-9.0.0-a6/test/IECore/ParameterisedProceduralTest.py b/cortex-9.0.0-a10/test/IECore/ParameterisedProceduralTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ParameterisedProceduralTest.py rename to cortex-9.0.0-a10/test/IECore/ParameterisedProceduralTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Parameters.py b/cortex-9.0.0-a10/test/IECore/Parameters.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Parameters.py rename to cortex-9.0.0-a10/test/IECore/Parameters.py diff --git a/cortex-9.0.0-a6/test/IECore/PatchMeshPrimitiveTest.py b/cortex-9.0.0-a10/test/IECore/PatchMeshPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PatchMeshPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECore/PatchMeshPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PerlinNoise.py b/cortex-9.0.0-a10/test/IECore/PerlinNoise.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PerlinNoise.py rename to cortex-9.0.0-a10/test/IECore/PerlinNoise.py diff --git a/cortex-9.0.0-a6/test/IECore/PointBoundsOp.py b/cortex-9.0.0-a10/test/IECore/PointBoundsOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointBoundsOp.py rename to cortex-9.0.0-a10/test/IECore/PointBoundsOp.py diff --git a/cortex-9.0.0-a6/test/IECore/PointDistributionOpTest.py b/cortex-9.0.0-a10/test/IECore/PointDistributionOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointDistributionOpTest.py rename to cortex-9.0.0-a10/test/IECore/PointDistributionOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PointDistributionTest.py b/cortex-9.0.0-a10/test/IECore/PointDistributionTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointDistributionTest.py rename to cortex-9.0.0-a10/test/IECore/PointDistributionTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PointSmoothSkinningOpTest.py b/cortex-9.0.0-a10/test/IECore/PointSmoothSkinningOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointSmoothSkinningOpTest.py rename to cortex-9.0.0-a10/test/IECore/PointSmoothSkinningOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PointVelocityDisplaceOp.py b/cortex-9.0.0-a10/test/IECore/PointVelocityDisplaceOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointVelocityDisplaceOp.py rename to cortex-9.0.0-a10/test/IECore/PointVelocityDisplaceOp.py diff --git a/cortex-9.0.0-a6/test/IECore/PointsExpressionOp.py b/cortex-9.0.0-a10/test/IECore/PointsExpressionOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointsExpressionOp.py rename to cortex-9.0.0-a10/test/IECore/PointsExpressionOp.py diff --git a/cortex-9.0.0-a6/test/IECore/PointsMotionOpTest.py b/cortex-9.0.0-a10/test/IECore/PointsMotionOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointsMotionOpTest.py rename to cortex-9.0.0-a10/test/IECore/PointsMotionOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PointsPrimitive.py b/cortex-9.0.0-a10/test/IECore/PointsPrimitive.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointsPrimitive.py rename to cortex-9.0.0-a10/test/IECore/PointsPrimitive.py diff --git a/cortex-9.0.0-a6/test/IECore/PointsPrimitiveEvaluatorTest.py b/cortex-9.0.0-a10/test/IECore/PointsPrimitiveEvaluatorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PointsPrimitiveEvaluatorTest.py rename to cortex-9.0.0-a10/test/IECore/PointsPrimitiveEvaluatorTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PolygonAlgoTest.py b/cortex-9.0.0-a10/test/IECore/PolygonAlgoTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PolygonAlgoTest.py rename to cortex-9.0.0-a10/test/IECore/PolygonAlgoTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PrimitiveEvaluator.py b/cortex-9.0.0-a10/test/IECore/PrimitiveEvaluator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PrimitiveEvaluator.py rename to cortex-9.0.0-a10/test/IECore/PrimitiveEvaluator.py diff --git a/cortex-9.0.0-a6/test/IECore/PrimitiveTest.py b/cortex-9.0.0-a10/test/IECore/PrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PrimitiveTest.py rename to cortex-9.0.0-a10/test/IECore/PrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECore/PrimitiveVariableTest.py b/cortex-9.0.0-a10/test/IECore/PrimitiveVariableTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/PrimitiveVariableTest.py rename to cortex-9.0.0-a10/test/IECore/PrimitiveVariableTest.py diff --git a/cortex-9.0.0-a6/test/IECore/RadixSortTest.cpp b/cortex-9.0.0-a10/test/IECore/RadixSortTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RadixSortTest.cpp rename to cortex-9.0.0-a10/test/IECore/RadixSortTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/RadixSortTest.h b/cortex-9.0.0-a10/test/IECore/RadixSortTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RadixSortTest.h rename to cortex-9.0.0-a10/test/IECore/RadixSortTest.h diff --git a/cortex-9.0.0-a6/test/IECore/RadixSortTest.py b/cortex-9.0.0-a10/test/IECore/RadixSortTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RadixSortTest.py rename to cortex-9.0.0-a10/test/IECore/RadixSortTest.py diff --git a/cortex-9.0.0-a6/test/IECore/RandomTest.py b/cortex-9.0.0-a10/test/IECore/RandomTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RandomTest.py rename to cortex-9.0.0-a10/test/IECore/RandomTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Reader.py b/cortex-9.0.0-a10/test/IECore/Reader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Reader.py rename to cortex-9.0.0-a10/test/IECore/Reader.py diff --git a/cortex-9.0.0-a6/test/IECore/RefCountedTest.py b/cortex-9.0.0-a10/test/IECore/RefCountedTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RefCountedTest.py rename to cortex-9.0.0-a10/test/IECore/RefCountedTest.py diff --git a/cortex-9.0.0-a6/test/IECore/RefCountedThreadingTest.cpp b/cortex-9.0.0-a10/test/IECore/RefCountedThreadingTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RefCountedThreadingTest.cpp rename to cortex-9.0.0-a10/test/IECore/RefCountedThreadingTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/RefCountedThreadingTest.h b/cortex-9.0.0-a10/test/IECore/RefCountedThreadingTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RefCountedThreadingTest.h rename to cortex-9.0.0-a10/test/IECore/RefCountedThreadingTest.h diff --git a/cortex-9.0.0-a6/test/IECore/RelativePreset.py b/cortex-9.0.0-a10/test/IECore/RelativePreset.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RelativePreset.py rename to cortex-9.0.0-a10/test/IECore/RelativePreset.py diff --git a/cortex-9.0.0-a6/test/IECore/RemovePrimitiveVariables.py b/cortex-9.0.0-a10/test/IECore/RemovePrimitiveVariables.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RemovePrimitiveVariables.py rename to cortex-9.0.0-a10/test/IECore/RemovePrimitiveVariables.py diff --git a/cortex-9.0.0-a6/test/IECore/RenamePrimitiveVariables.py b/cortex-9.0.0-a10/test/IECore/RenamePrimitiveVariables.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RenamePrimitiveVariables.py rename to cortex-9.0.0-a10/test/IECore/RenamePrimitiveVariables.py diff --git a/cortex-9.0.0-a6/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py b/cortex-9.0.0-a10/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py rename to cortex-9.0.0-a10/test/IECore/ReorderSmoothSkinningInfluencesOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/ReversedFrameList.py b/cortex-9.0.0-a10/test/IECore/ReversedFrameList.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ReversedFrameList.py rename to cortex-9.0.0-a10/test/IECore/ReversedFrameList.py diff --git a/cortex-9.0.0-a6/test/IECore/RunTimeTyped.py b/cortex-9.0.0-a10/test/IECore/RunTimeTyped.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/RunTimeTyped.py rename to cortex-9.0.0-a10/test/IECore/RunTimeTyped.py diff --git a/cortex-9.0.0-a6/test/IECore/SGIImageReaderTest.py b/cortex-9.0.0-a10/test/IECore/SGIImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SGIImageReaderTest.py rename to cortex-9.0.0-a10/test/IECore/SGIImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SWAReaderTest.py b/cortex-9.0.0-a10/test/IECore/SWAReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SWAReaderTest.py rename to cortex-9.0.0-a10/test/IECore/SWAReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SceneCacheTest.py b/cortex-9.0.0-a10/test/IECore/SceneCacheTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SceneCacheTest.py rename to cortex-9.0.0-a10/test/IECore/SceneCacheTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SceneCacheThreadingTest.cpp b/cortex-9.0.0-a10/test/IECore/SceneCacheThreadingTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SceneCacheThreadingTest.cpp rename to cortex-9.0.0-a10/test/IECore/SceneCacheThreadingTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/SceneCacheThreadingTest.h b/cortex-9.0.0-a10/test/IECore/SceneCacheThreadingTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SceneCacheThreadingTest.h rename to cortex-9.0.0-a10/test/IECore/SceneCacheThreadingTest.h diff --git a/cortex-9.0.0-a6/test/IECore/SceneInterfaceTest.py b/cortex-9.0.0-a10/test/IECore/SceneInterfaceTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SceneInterfaceTest.py rename to cortex-9.0.0-a10/test/IECore/SceneInterfaceTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SearchPath.py b/cortex-9.0.0-a10/test/IECore/SearchPath.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SearchPath.py rename to cortex-9.0.0-a10/test/IECore/SearchPath.py diff --git a/cortex-9.0.0-a6/test/IECore/SearchReplaceOp.py b/cortex-9.0.0-a10/test/IECore/SearchReplaceOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SearchReplaceOp.py rename to cortex-9.0.0-a10/test/IECore/SearchReplaceOp.py diff --git a/cortex-9.0.0-a6/test/IECore/SequenceLsOpTest.py b/cortex-9.0.0-a10/test/IECore/SequenceLsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SequenceLsOpTest.py rename to cortex-9.0.0-a10/test/IECore/SequenceLsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Shader.py b/cortex-9.0.0-a10/test/IECore/Shader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Shader.py rename to cortex-9.0.0-a10/test/IECore/Shader.py diff --git a/cortex-9.0.0-a6/test/IECore/SimpleTypedData.py b/cortex-9.0.0-a10/test/IECore/SimpleTypedData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SimpleTypedData.py rename to cortex-9.0.0-a10/test/IECore/SimpleTypedData.py diff --git a/cortex-9.0.0-a6/test/IECore/SmoothSkinningDataTest.py b/cortex-9.0.0-a10/test/IECore/SmoothSkinningDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SmoothSkinningDataTest.py rename to cortex-9.0.0-a10/test/IECore/SmoothSkinningDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SmoothSmoothSkinningWeightsOpTest.py b/cortex-9.0.0-a10/test/IECore/SmoothSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SmoothSmoothSkinningWeightsOpTest.py rename to cortex-9.0.0-a10/test/IECore/SmoothSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SpaceTransformTest.cpp b/cortex-9.0.0-a10/test/IECore/SpaceTransformTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SpaceTransformTest.cpp rename to cortex-9.0.0-a10/test/IECore/SpaceTransformTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/SpaceTransformTest.h b/cortex-9.0.0-a10/test/IECore/SpaceTransformTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SpaceTransformTest.h rename to cortex-9.0.0-a10/test/IECore/SpaceTransformTest.h diff --git a/cortex-9.0.0-a6/test/IECore/SpherePrimitiveEvaluator.py b/cortex-9.0.0-a10/test/IECore/SpherePrimitiveEvaluator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SpherePrimitiveEvaluator.py rename to cortex-9.0.0-a10/test/IECore/SpherePrimitiveEvaluator.py diff --git a/cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.cpp b/cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.cpp rename to cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.h b/cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.h rename to cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.h diff --git a/cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.inl b/cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SphericalHarmonicsTest.inl rename to cortex-9.0.0-a10/test/IECore/SphericalHarmonicsTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/SplineDataTest.py b/cortex-9.0.0-a10/test/IECore/SplineDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SplineDataTest.py rename to cortex-9.0.0-a10/test/IECore/SplineDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SplineParameterTest.py b/cortex-9.0.0-a10/test/IECore/SplineParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SplineParameterTest.py rename to cortex-9.0.0-a10/test/IECore/SplineParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SplineTest.py b/cortex-9.0.0-a10/test/IECore/SplineTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SplineTest.py rename to cortex-9.0.0-a10/test/IECore/SplineTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SplineToImageTest.py b/cortex-9.0.0-a10/test/IECore/SplineToImageTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SplineToImageTest.py rename to cortex-9.0.0-a10/test/IECore/SplineToImageTest.py diff --git a/cortex-9.0.0-a6/test/IECore/StandardRadialLensModelTest.py b/cortex-9.0.0-a10/test/IECore/StandardRadialLensModelTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/StandardRadialLensModelTest.py rename to cortex-9.0.0-a10/test/IECore/StandardRadialLensModelTest.py diff --git a/cortex-9.0.0-a6/test/IECore/StringAlgoTest.cpp b/cortex-9.0.0-a10/test/IECore/StringAlgoTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/StringAlgoTest.cpp rename to cortex-9.0.0-a10/test/IECore/StringAlgoTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/StringAlgoTest.h b/cortex-9.0.0-a10/test/IECore/StringAlgoTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/StringAlgoTest.h rename to cortex-9.0.0-a10/test/IECore/StringAlgoTest.h diff --git a/cortex-9.0.0-a6/test/IECore/StringUtilTest.py b/cortex-9.0.0-a10/test/IECore/StringUtilTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/StringUtilTest.py rename to cortex-9.0.0-a10/test/IECore/StringUtilTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Struct.py b/cortex-9.0.0-a10/test/IECore/Struct.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Struct.py rename to cortex-9.0.0-a10/test/IECore/Struct.py diff --git a/cortex-9.0.0-a6/test/IECore/SubstitutedDictTest.py b/cortex-9.0.0-a10/test/IECore/SubstitutedDictTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SubstitutedDictTest.py rename to cortex-9.0.0-a10/test/IECore/SubstitutedDictTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SummedAreaOpTest.py b/cortex-9.0.0-a10/test/IECore/SummedAreaOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SummedAreaOpTest.py rename to cortex-9.0.0-a10/test/IECore/SummedAreaOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/SweepAndPruneTest.cpp b/cortex-9.0.0-a10/test/IECore/SweepAndPruneTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SweepAndPruneTest.cpp rename to cortex-9.0.0-a10/test/IECore/SweepAndPruneTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/SweepAndPruneTest.h b/cortex-9.0.0-a10/test/IECore/SweepAndPruneTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/SweepAndPruneTest.h rename to cortex-9.0.0-a10/test/IECore/SweepAndPruneTest.h diff --git a/cortex-9.0.0-a6/test/IECore/TGAImageReaderTest.py b/cortex-9.0.0-a10/test/IECore/TGAImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TGAImageReaderTest.py rename to cortex-9.0.0-a10/test/IECore/TGAImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TGAImageWriterTest.py b/cortex-9.0.0-a10/test/IECore/TGAImageWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TGAImageWriterTest.py rename to cortex-9.0.0-a10/test/IECore/TGAImageWriterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TIFFImageReader.py b/cortex-9.0.0-a10/test/IECore/TIFFImageReader.py similarity index 94% rename from cortex-9.0.0-a6/test/IECore/TIFFImageReader.py rename to cortex-9.0.0-a10/test/IECore/TIFFImageReader.py index f6538035e9..5e74d51e82 100644 --- a/cortex-9.0.0-a6/test/IECore/TIFFImageReader.py +++ b/cortex-9.0.0-a10/test/IECore/TIFFImageReader.py @@ -41,6 +41,9 @@ from IECore import * +def extractColorPixel( file, index ): + return Color3f( file.read()["R"].data[index], file.read()["G"].data[index], file.read()["B"].data[index] ) + class TestTIFFReader(unittest.TestCase): def testConstruction( self ): @@ -152,6 +155,19 @@ def testSourceColorSpace( self ): # for other bit-depths it assumes srgb self.assertEqual( Reader.create( "test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif" ).sourceColorSpace(), "srgb" ) + def testTDLColorSpace( self ): + + linearFile = Reader.create( "test/IECore/data/tdl/grey50_linear.tdl" ) + self.assertEqual( linearFile.sourceColorSpace(), "linear" ) + self.assertEqual( extractColorPixel( linearFile, 0 ), Color3f( 0.501960814 ) ) + srgbFile = Reader.create( "test/IECore/data/tdl/grey50_srgb.tdl" ) + self.assertEqual( srgbFile.sourceColorSpace(), "srgb" ) + self.assertEqual( extractColorPixel( srgbFile, 0 ), Color3f( 0.215860516 ) ) + rec709File = Reader.create( "test/IECore/data/tdl/grey50_BT709.tdl" ) + self.assertEqual( rec709File.sourceColorSpace(), "rec709" ) + self.assertEqual( extractColorPixel( rec709File, 0 ), Color3f( 0.261481494 ) ) + + def testDataWindow( self ): r = Reader.create( "test/IECore/data/tiff/cropWindow.640x480.16bit.tif" ) self.assertEqual( type(r), TIFFImageReader ) diff --git a/cortex-9.0.0-a6/test/IECore/TIFFImageWriter.py b/cortex-9.0.0-a10/test/IECore/TIFFImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TIFFImageWriter.py rename to cortex-9.0.0-a10/test/IECore/TIFFImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/ThreadingTest.py b/cortex-9.0.0-a10/test/IECore/ThreadingTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ThreadingTest.py rename to cortex-9.0.0-a10/test/IECore/ThreadingTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TimeCodeDataTest.py b/cortex-9.0.0-a10/test/IECore/TimeCodeDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TimeCodeDataTest.py rename to cortex-9.0.0-a10/test/IECore/TimeCodeDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TimeCodeParameterTest.py b/cortex-9.0.0-a10/test/IECore/TimeCodeParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TimeCodeParameterTest.py rename to cortex-9.0.0-a10/test/IECore/TimeCodeParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TimeDurationDataTest.py b/cortex-9.0.0-a10/test/IECore/TimeDurationDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TimeDurationDataTest.py rename to cortex-9.0.0-a10/test/IECore/TimeDurationDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TimePeriodDataTest.py b/cortex-9.0.0-a10/test/IECore/TimePeriodDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TimePeriodDataTest.py rename to cortex-9.0.0-a10/test/IECore/TimePeriodDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TransferSmoothSkinningWeightsOpTest.py b/cortex-9.0.0-a10/test/IECore/TransferSmoothSkinningWeightsOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TransferSmoothSkinningWeightsOpTest.py rename to cortex-9.0.0-a10/test/IECore/TransferSmoothSkinningWeightsOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Transform.py b/cortex-9.0.0-a10/test/IECore/Transform.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Transform.py rename to cortex-9.0.0-a10/test/IECore/Transform.py diff --git a/cortex-9.0.0-a6/test/IECore/TransformOpTest.py b/cortex-9.0.0-a10/test/IECore/TransformOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TransformOpTest.py rename to cortex-9.0.0-a10/test/IECore/TransformOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TransformationMatrixData.py b/cortex-9.0.0-a10/test/IECore/TransformationMatrixData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TransformationMatrixData.py rename to cortex-9.0.0-a10/test/IECore/TransformationMatrixData.py diff --git a/cortex-9.0.0-a6/test/IECore/TriangleAlgoTest.py b/cortex-9.0.0-a10/test/IECore/TriangleAlgoTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TriangleAlgoTest.py rename to cortex-9.0.0-a10/test/IECore/TriangleAlgoTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TriangulateOp.py b/cortex-9.0.0-a10/test/IECore/TriangulateOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TriangulateOp.py rename to cortex-9.0.0-a10/test/IECore/TriangulateOp.py diff --git a/cortex-9.0.0-a6/test/IECore/TriangulatorTest.py b/cortex-9.0.0-a10/test/IECore/TriangulatorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TriangulatorTest.py rename to cortex-9.0.0-a10/test/IECore/TriangulatorTest.py diff --git a/cortex-9.0.0-a6/test/IECore/Turbulence.py b/cortex-9.0.0-a10/test/IECore/Turbulence.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Turbulence.py rename to cortex-9.0.0-a10/test/IECore/Turbulence.py diff --git a/cortex-9.0.0-a6/test/IECore/TypeIdTest.py b/cortex-9.0.0-a10/test/IECore/TypeIdTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypeIdTest.py rename to cortex-9.0.0-a10/test/IECore/TypeIdTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TypeTraitsTest.cpp b/cortex-9.0.0-a10/test/IECore/TypeTraitsTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypeTraitsTest.cpp rename to cortex-9.0.0-a10/test/IECore/TypeTraitsTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/TypedDataAsObject.py b/cortex-9.0.0-a10/test/IECore/TypedDataAsObject.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedDataAsObject.py rename to cortex-9.0.0-a10/test/IECore/TypedDataAsObject.py diff --git a/cortex-9.0.0-a6/test/IECore/TypedDataTest.cpp b/cortex-9.0.0-a10/test/IECore/TypedDataTest.cpp similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedDataTest.cpp rename to cortex-9.0.0-a10/test/IECore/TypedDataTest.cpp diff --git a/cortex-9.0.0-a6/test/IECore/TypedDataTest.h b/cortex-9.0.0-a10/test/IECore/TypedDataTest.h similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedDataTest.h rename to cortex-9.0.0-a10/test/IECore/TypedDataTest.h diff --git a/cortex-9.0.0-a6/test/IECore/TypedDataTest.inl b/cortex-9.0.0-a10/test/IECore/TypedDataTest.inl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedDataTest.inl rename to cortex-9.0.0-a10/test/IECore/TypedDataTest.inl diff --git a/cortex-9.0.0-a6/test/IECore/TypedDataTest.py b/cortex-9.0.0-a10/test/IECore/TypedDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedDataTest.py rename to cortex-9.0.0-a10/test/IECore/TypedDataTest.py diff --git a/cortex-9.0.0-a6/test/IECore/TypedPrimitiveOp.py b/cortex-9.0.0-a10/test/IECore/TypedPrimitiveOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/TypedPrimitiveOp.py rename to cortex-9.0.0-a10/test/IECore/TypedPrimitiveOp.py diff --git a/cortex-9.0.0-a6/test/IECore/UVDistortOpTest.py b/cortex-9.0.0-a10/test/IECore/UVDistortOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/UVDistortOpTest.py rename to cortex-9.0.0-a10/test/IECore/UVDistortOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/UnicodeToStringTest.py b/cortex-9.0.0-a10/test/IECore/UnicodeToStringTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/UnicodeToStringTest.py rename to cortex-9.0.0-a10/test/IECore/UnicodeToStringTest.py diff --git a/cortex-9.0.0-a6/test/IECore/UniformRandomPointDistributionOpTest.py b/cortex-9.0.0-a10/test/IECore/UniformRandomPointDistributionOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/UniformRandomPointDistributionOpTest.py rename to cortex-9.0.0-a10/test/IECore/UniformRandomPointDistributionOpTest.py diff --git a/cortex-9.0.0-a6/test/IECore/VectorData.py b/cortex-9.0.0-a10/test/IECore/VectorData.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/VectorData.py rename to cortex-9.0.0-a10/test/IECore/VectorData.py diff --git a/cortex-9.0.0-a6/test/IECore/VectorDataFilterOp.py b/cortex-9.0.0-a10/test/IECore/VectorDataFilterOp.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/VectorDataFilterOp.py rename to cortex-9.0.0-a10/test/IECore/VectorDataFilterOp.py diff --git a/cortex-9.0.0-a6/test/IECore/WrapperGarbageCollection.py b/cortex-9.0.0-a10/test/IECore/WrapperGarbageCollection.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/WrapperGarbageCollection.py rename to cortex-9.0.0-a10/test/IECore/WrapperGarbageCollection.py diff --git a/cortex-9.0.0-a6/test/IECore/WrapperToPython.py b/cortex-9.0.0-a10/test/IECore/WrapperToPython.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/WrapperToPython.py rename to cortex-9.0.0-a10/test/IECore/WrapperToPython.py diff --git a/cortex-9.0.0-a6/test/IECore/Writer.py b/cortex-9.0.0-a10/test/IECore/Writer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/Writer.py rename to cortex-9.0.0-a10/test/IECore/Writer.py diff --git a/cortex-9.0.0-a6/test/IECore/YUVImageWriter.py b/cortex-9.0.0-a10/test/IECore/YUVImageWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/YUVImageWriter.py rename to cortex-9.0.0-a10/test/IECore/YUVImageWriter.py diff --git a/cortex-9.0.0-a6/test/IECore/config/exceptions/badConfig.py b/cortex-9.0.0-a10/test/IECore/config/exceptions/badConfig.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/exceptions/badConfig.py rename to cortex-9.0.0-a10/test/IECore/config/exceptions/badConfig.py diff --git a/cortex-9.0.0-a6/test/IECore/config/ignoreFiles/a.py b/cortex-9.0.0-a10/test/IECore/config/ignoreFiles/a.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/ignoreFiles/a.py rename to cortex-9.0.0-a10/test/IECore/config/ignoreFiles/a.py diff --git a/cortex-9.0.0-a6/test/IECore/config/ignoreFiles/notDotPy b/cortex-9.0.0-a10/test/IECore/config/ignoreFiles/notDotPy similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/ignoreFiles/notDotPy rename to cortex-9.0.0-a10/test/IECore/config/ignoreFiles/notDotPy diff --git a/cortex-9.0.0-a6/test/IECore/config/ignoreFiles/~config.py b/cortex-9.0.0-a10/test/IECore/config/ignoreFiles/~config.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/ignoreFiles/~config.py rename to cortex-9.0.0-a10/test/IECore/config/ignoreFiles/~config.py diff --git a/cortex-9.0.0-a6/test/IECore/config/orderDir/a.py b/cortex-9.0.0-a10/test/IECore/config/orderDir/a.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/orderDir/a.py rename to cortex-9.0.0-a10/test/IECore/config/orderDir/a.py diff --git a/cortex-9.0.0-a6/test/IECore/config/orderDir/b.py b/cortex-9.0.0-a10/test/IECore/config/orderDir/b.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/orderDir/b.py rename to cortex-9.0.0-a10/test/IECore/config/orderDir/b.py diff --git a/cortex-9.0.0-a6/test/IECore/config/orderOne/config.py b/cortex-9.0.0-a10/test/IECore/config/orderOne/config.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/orderOne/config.py rename to cortex-9.0.0-a10/test/IECore/config/orderOne/config.py diff --git a/cortex-9.0.0-a6/test/IECore/config/orderTwo/config.py b/cortex-9.0.0-a10/test/IECore/config/orderTwo/config.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/orderTwo/config.py rename to cortex-9.0.0-a10/test/IECore/config/orderTwo/config.py diff --git a/cortex-9.0.0-a6/test/IECore/config/scope/testScope.py b/cortex-9.0.0-a10/test/IECore/config/scope/testScope.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/config/scope/testScope.py rename to cortex-9.0.0-a10/test/IECore/config/scope/testScope.py diff --git a/cortex-9.0.0-a6/test/IECore/data/StandardRadialLens.cob b/cortex-9.0.0-a10/test/IECore/data/StandardRadialLens.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/StandardRadialLens.cob rename to cortex-9.0.0-a10/test/IECore/data/StandardRadialLens.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.new.0250.fio b/cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.new.0250.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.new.0250.fio rename to cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.new.0250.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.new.0500.fio b/cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.new.0500.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.new.0500.fio rename to cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.new.0500.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.old.1000.fio b/cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.old.1000.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.old.1000.fio rename to cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.old.1000.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.old.1250.fio b/cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.old.1250.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/attributeCaches/transform.old.1250.fio rename to cortex-9.0.0-a10/test/IECore/data/attributeCaches/transform.old.1250.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob b/cortex-9.0.0-a10/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob rename to cortex-9.0.0-a10/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py b/cortex-9.0.0-a10/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py rename to cortex-9.0.0-a10/test/IECore/data/basicPreset/basicPresetLoadTest/basicPresetLoadTest-1.py diff --git a/cortex-9.0.0-a6/test/IECore/data/cachedReaderPath1/file.cob b/cortex-9.0.0-a10/test/IECore/data/cachedReaderPath1/file.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cachedReaderPath1/file.cob rename to cortex-9.0.0-a10/test/IECore/data/cachedReaderPath1/file.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cachedReaderPath2/file.cob b/cortex-9.0.0-a10/test/IECore/data/cachedReaderPath2/file.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cachedReaderPath2/file.cob rename to cortex-9.0.0-a10/test/IECore/data/cachedReaderPath2/file.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cinFiles/bluegreen_noise.cin b/cortex-9.0.0-a10/test/IECore/data/cinFiles/bluegreen_noise.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cinFiles/bluegreen_noise.cin rename to cortex-9.0.0-a10/test/IECore/data/cinFiles/bluegreen_noise.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/cinFiles/flag_16x16.cin b/cortex-9.0.0-a10/test/IECore/data/cinFiles/flag_16x16.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cinFiles/flag_16x16.cin rename to cortex-9.0.0-a10/test/IECore/data/cinFiles/flag_16x16.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/cinFiles/ramp.cin b/cortex-9.0.0-a10/test/IECore/data/cinFiles/ramp.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cinFiles/ramp.cin rename to cortex-9.0.0-a10/test/IECore/data/cinFiles/ramp.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/cinFiles/uvMap.512x256.cin b/cortex-9.0.0-a10/test/IECore/data/cinFiles/uvMap.512x256.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cinFiles/uvMap.512x256.cin rename to cortex-9.0.0-a10/test/IECore/data/cinFiles/uvMap.512x256.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/ball.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/ball.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/ball.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/ball.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/beforeEmptyContainerOptimisation.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/compoundData.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/compoundData.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/compoundData.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/compoundData.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/compoundDataAsSQL.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/compoundDataAsSQL.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/compoundDataAsSQL.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/compoundDataAsSQL.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/coordinateSystemBeforeTransforms.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/cylinder3Mesh.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/cylinder3Mesh.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/cylinder3Mesh.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/cylinder3Mesh.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/filteredBall.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/filteredBall.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/filteredBall.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/filteredBall.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/header.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/header.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/header.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/header.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/intDataTen.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/intDataTen.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/intDataTen.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/intDataTen.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/intDataTenAsSQL.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/intDataTenAsSQL.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/intDataTenAsSQL.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/intDataTenAsSQL.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/meshPrimitiveV0.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/meshPrimitiveV0.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/meshPrimitiveV0.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/meshPrimitiveV0.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/pCubeShape1.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/pCubeShape1.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/pCubeShape1.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/pCubeShape1.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/pSphereShape1.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/pSphereShape1.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/pSphereShape1.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/pSphereShape1.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/polySphereQuads.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/polySphereQuads.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/polySphereQuads.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/polySphereQuads.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/torusCurves.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/torusCurves.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/torusCurves.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/torusCurves.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/twoTrianglesWithSharedUVs.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob b/cortex-9.0.0-a10/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob rename to cortex-9.0.0-a10/test/IECore/data/cobFiles/twoTrianglesWithSplitAndOpposedUVs.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/dpx/bluegreen_noise.dpx b/cortex-9.0.0-a10/test/IECore/data/dpx/bluegreen_noise.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/dpx/bluegreen_noise.dpx rename to cortex-9.0.0-a10/test/IECore/data/dpx/bluegreen_noise.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/dpx/colorBarsWithAlpha.dpx b/cortex-9.0.0-a10/test/IECore/data/dpx/colorBarsWithAlpha.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/dpx/colorBarsWithAlpha.dpx rename to cortex-9.0.0-a10/test/IECore/data/dpx/colorBarsWithAlpha.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/dpx/ramp.dpx b/cortex-9.0.0-a10/test/IECore/data/dpx/ramp.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/dpx/ramp.dpx rename to cortex-9.0.0-a10/test/IECore/data/dpx/ramp.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/dpx/uvMap.512x256.dpx b/cortex-9.0.0-a10/test/IECore/data/dpx/uvMap.512x256.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/dpx/uvMap.512x256.dpx rename to cortex-9.0.0-a10/test/IECore/data/dpx/uvMap.512x256.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/empty b/cortex-9.0.0-a10/test/IECore/data/empty similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/empty rename to cortex-9.0.0-a10/test/IECore/data/empty diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/colorSpaceTransformOp1.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/colorSpaceTransformOpPanalog.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/convolvedColorBarsWithAlpha.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg b/cortex-9.0.0-a10/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/cubeColorTransformOp1.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMax.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMax.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMax.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMax.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMin.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMin.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMin.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMin.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpMultiply.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpOver.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpOver.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCompositeOpOver.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCompositeOpOver.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow2.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow2.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow2.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow2.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindow2Matched.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageCropDataWindowMatched.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imagePrimitiveEvaluatorUpscale.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0001.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0002.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0003.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0004.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0005.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/imageSequenceCompositeOp.0006.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationV2ff.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/inverseDistanceWeightedInterpolationVectorV2ff.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/marschnerLookup.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/marschnerLookup.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/marschnerLookup.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/marschnerLookup.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob b/cortex-9.0.0-a10/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/meshVertexReorderQuadSphere.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/meshVertexReorderSphere.cob b/cortex-9.0.0-a10/test/IECore/data/expectedResults/meshVertexReorderSphere.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/meshVertexReorderSphere.cob rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/meshVertexReorderSphere.cob diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff0.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff0.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff0.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff0.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff1.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff1.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff1.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff1.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff2.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff2.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff2.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff2.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff3.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff3.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff3.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff3.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff4.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff4.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff4.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff4.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff5.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff5.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff5.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff5.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff6.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff6.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff6.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff6.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff7.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff7.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff7.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff7.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff8.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff8.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff8.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff8.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff9.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff9.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/multiDirTiff9.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/multiDirTiff9.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.cin b/cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.cin rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.dpx b/cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.dpx rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.jpg b/cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.jpg rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.tga b/cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.tga similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.tga rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.tga diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.tiff b/cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/oversizeDataWindow.tiff rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/oversizeDataWindow.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0000.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0000.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0000.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0000.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0001.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0001.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0001.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0001.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0002.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0002.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0002.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0002.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0003.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0003.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0003.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0003.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0004.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0004.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlin3d.0004.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlin3d.0004.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinV2fColor3f.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinV2fColor3f.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinV2fColor3f.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinV2fColor3f.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinV2ff.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinV2ff.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinV2ff.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinV2ff.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinff.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinff.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/perlinff.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/perlinff.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/turbulence2d.exr b/cortex-9.0.0-a10/test/IECore/data/expectedResults/turbulence2d.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/turbulence2d.exr rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/turbulence2d.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin b/cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx b/cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg b/cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/uvMapWithDataWindow.100x100.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.cin b/cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.cin rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.dpx b/cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.dpx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.dpx rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.dpx diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.jpg b/cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.jpg rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.tga b/cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.tga similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.tga rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.tga diff --git a/cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.tif b/cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/expectedResults/windowWrite.tif rename to cortex-9.0.0-a10/test/IECore/data/expectedResults/windowWrite.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/AllHalfValues.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/AllHalfValues.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/AllHalfValues.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/AllHalfValues.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/carPark.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/carPark.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/carPark.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/carPark.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checker1Premult.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checker1Premult.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checker1Premult.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checker1Premult.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checker1Unpremult.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checker1Unpremult.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checker1Unpremult.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checker1Unpremult.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2Premult.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2Premult.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2Premult.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2Premult.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2PremultSRGB.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2PremultSRGB.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2PremultSRGB.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2PremultSRGB.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2Unpremult.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2Unpremult.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checker2Unpremult.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checker2Unpremult.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0001.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0001.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0001.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0001.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0002.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0002.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0002.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0002.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0003.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0003.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0003.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0003.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0004.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0004.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0004.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0004.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0005.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0005.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0005.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0005.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0006.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0006.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/checkerAnimated.0006.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/checkerAnimated.0006.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0001.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0002.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0003.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0004.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0005.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsAnimated.0006.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsWithAlpha.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsWithAlpha.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsWithAlpha.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsWithAlpha.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/colorBarsWithDataWindow.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/distorted_21mm_uv.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/distorted_21mm_uv.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/distorted_21mm_uv.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/distorted_21mm_uv.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/float256x256.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/float256x256.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/float256x256.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/float256x256.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/gradedRamp.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/gradedRamp.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/gradedRamp.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/gradedRamp.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/incomplete.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/incomplete.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/incomplete.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/incomplete.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/manyChannels.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/manyChannels.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/manyChannels.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/manyChannels.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/oversizeDataWindow.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/oversizeDataWindow.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/oversizeDataWindow.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/oversizeDataWindow.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/ramp.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/ramp.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/ramp.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/ramp.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/redgreen_gradient_piz_256x256.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/tiffTileTestExpectedResults.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/undistorted_21mm_uv.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/undistorted_21mm_uv.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/undistorted_21mm_uv.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/undistorted_21mm_uv.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMap.256x256.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMap.256x256.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMap.256x256.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMap.256x256.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMap.512x256.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMap.512x256.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMap.512x256.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMap.512x256.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMapWithDataWindow.100x100.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr b/cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr rename to cortex-9.0.0-a10/test/IECore/data/exrFiles/uvMapWithDataWindowDistorted.100x100.exr diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/2.13.0/osx104.i686/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/2.13.0/rhel4.i686/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/3.0.0/cent5.x86_64/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/3.0.0/rhel4.i686/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/4.16.0/cent5.x86_64/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio b/cortex-9.0.0-a10/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio rename to cortex-9.0.0-a10/test/IECore/data/fioFiles/5.0.0/cent5.x86_64/types.fio diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/COPYRIGHT.TXT b/cortex-9.0.0-a10/test/IECore/data/fonts/COPYRIGHT.TXT similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/COPYRIGHT.TXT rename to cortex-9.0.0-a10/test/IECore/data/fonts/COPYRIGHT.TXT diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/Vera.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/Vera.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/Vera.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/Vera.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraBI.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraBI.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraBI.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraBI.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraBd.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraBd.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraBd.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraBd.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraIt.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraIt.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraIt.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraIt.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoBI.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoBI.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoBI.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoBI.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoBd.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoBd.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoBd.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoBd.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoIt.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoIt.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraMoIt.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraMoIt.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraMono.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraMono.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraMono.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraMono.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraSe.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraSe.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraSe.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraSe.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/fonts/VeraSeBd.ttf b/cortex-9.0.0-a10/test/IECore/data/fonts/VeraSeBd.ttf similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/fonts/VeraSeBd.ttf rename to cortex-9.0.0-a10/test/IECore/data/fonts/VeraSeBd.ttf diff --git a/cortex-9.0.0-a6/test/IECore/data/idxFiles/test.idx b/cortex-9.0.0-a10/test/IECore/data/idxFiles/test.idx similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/idxFiles/test.idx rename to cortex-9.0.0-a10/test/IECore/data/idxFiles/test.idx diff --git a/cortex-9.0.0-a6/test/IECore/data/iffFiles/image.iff b/cortex-9.0.0-a10/test/IECore/data/iffFiles/image.iff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/iffFiles/image.iff rename to cortex-9.0.0-a10/test/IECore/data/iffFiles/image.iff diff --git a/cortex-9.0.0-a6/test/IECore/data/iffFiles/nClothFrame3.mc b/cortex-9.0.0-a10/test/IECore/data/iffFiles/nClothFrame3.mc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/iffFiles/nClothFrame3.mc rename to cortex-9.0.0-a10/test/IECore/data/iffFiles/nClothFrame3.mc diff --git a/cortex-9.0.0-a6/test/IECore/data/iffFiles/nParticleFrame2.mc b/cortex-9.0.0-a10/test/IECore/data/iffFiles/nParticleFrame2.mc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/iffFiles/nParticleFrame2.mc rename to cortex-9.0.0-a10/test/IECore/data/iffFiles/nParticleFrame2.mc diff --git a/cortex-9.0.0-a6/test/IECore/data/iffFiles/nParticleMultipleFrames.mc b/cortex-9.0.0-a10/test/IECore/data/iffFiles/nParticleMultipleFrames.mc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/iffFiles/nParticleMultipleFrames.mc rename to cortex-9.0.0-a10/test/IECore/data/iffFiles/nParticleMultipleFrames.mc diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/21mm.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/21mm.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/21mm.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/21mm.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/bluegreen_noise.400x300.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/bluegreen_noise.400x300.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/bluegreen_noise.400x300.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/bluegreen_noise.400x300.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/exif.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/exif.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/exif.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/exif.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/greyscaleCheckerBoard.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/greyscaleCheckerBoard.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/greyscaleCheckerBoard.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/greyscaleCheckerBoard.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/test test.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/test test.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/test test.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/test test.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/uvMap.512x256.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/uvMap.512x256.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/uvMap.512x256.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/uvMap.512x256.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/jpg/uvMap.512x256.truncated.jpg b/cortex-9.0.0-a10/test/IECore/data/jpg/uvMap.512x256.truncated.jpg similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/jpg/uvMap.512x256.truncated.jpg rename to cortex-9.0.0-a10/test/IECore/data/jpg/uvMap.512x256.truncated.jpg diff --git a/cortex-9.0.0-a6/test/IECore/data/nukeScripts/dependencies.nk b/cortex-9.0.0-a10/test/IECore/data/nukeScripts/dependencies.nk similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/nukeScripts/dependencies.nk rename to cortex-9.0.0-a10/test/IECore/data/nukeScripts/dependencies.nk diff --git a/cortex-9.0.0-a6/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk b/cortex-9.0.0-a10/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk rename to cortex-9.0.0-a10/test/IECore/data/nukeScripts/dependenciesWithSpaces.nk diff --git a/cortex-9.0.0-a6/test/IECore/data/null b/cortex-9.0.0-a10/test/IECore/data/null similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/null rename to cortex-9.0.0-a10/test/IECore/data/null diff --git a/cortex-9.0.0-a6/test/IECore/data/null.cin b/cortex-9.0.0-a10/test/IECore/data/null.cin similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/null.cin rename to cortex-9.0.0-a10/test/IECore/data/null.cin diff --git a/cortex-9.0.0-a6/test/IECore/data/obj/groups.obj b/cortex-9.0.0-a10/test/IECore/data/obj/groups.obj similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/obj/groups.obj rename to cortex-9.0.0-a10/test/IECore/data/obj/groups.obj diff --git a/cortex-9.0.0-a6/test/IECore/data/obj/triangle.obj b/cortex-9.0.0-a10/test/IECore/data/obj/triangle.obj similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/obj/triangle.obj rename to cortex-9.0.0-a10/test/IECore/data/obj/triangle.obj diff --git a/cortex-9.0.0-a6/test/IECore/data/obj/triangle_no_texture.obj b/cortex-9.0.0-a10/test/IECore/data/obj/triangle_no_texture.obj similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/obj/triangle_no_texture.obj rename to cortex-9.0.0-a10/test/IECore/data/obj/triangle_no_texture.obj diff --git a/cortex-9.0.0-a6/test/IECore/data/obj/triangle_normals.obj b/cortex-9.0.0-a10/test/IECore/data/obj/triangle_normals.obj similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/obj/triangle_normals.obj rename to cortex-9.0.0-a10/test/IECore/data/obj/triangle_normals.obj diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/10Particles.pdc b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/10Particles.pdc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/10Particles.pdc rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/10Particles.pdc diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleMesh.pdc b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleMesh.pdc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleMesh.pdc rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleMesh.pdc diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.250.pdc b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.250.pdc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.250.pdc rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.250.pdc diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.intId.250.pdc diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/particleShape1.noId.250.pdc diff --git a/cortex-9.0.0-a6/test/IECore/data/pdcFiles/scene.ma b/cortex-9.0.0-a10/test/IECore/data/pdcFiles/scene.ma similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pdcFiles/scene.ma rename to cortex-9.0.0-a10/test/IECore/data/pdcFiles/scene.ma diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.LICENSE diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.README b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.README similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.README rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.README diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/PngSuite.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/PngSuite.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi4a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi4a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi4a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi4a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi4a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi4a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi4a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi4a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi6a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi6a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi6a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi6a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi6a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi6a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basi6a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basi6a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn4a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn4a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn4a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn4a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn4a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn4a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn4a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn4a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn6a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn6a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn6a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn6a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn6a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn6a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/basn6a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/basn6a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgai4a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgai4a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgai4a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgai4a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgai4a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgai4a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgai4a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgai4a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgan6a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgan6a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgan6a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgan6a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgan6a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgan6a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgan6a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgan6a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgbn4a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgbn4a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgbn4a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgbn4a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bggn4a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bggn4a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bggn4a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bggn4a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgwn6a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgwn6a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgwn6a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgwn6a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgyn6a16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgyn6a16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/bgyn6a16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/bgyn6a16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ccwn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ccwn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ccwn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ccwn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ccwn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ccwn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ccwn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ccwn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdfn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdfn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdfn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdfn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdhn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdhn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdhn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdhn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdsn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdsn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdsn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdsn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdun2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdun2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cdun2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cdun2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ch1n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ch1n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ch1n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ch1n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ch2n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ch2n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ch2n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ch2n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm0n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm0n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm0n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm0n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm7n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm7n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm7n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm7n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm9n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm9n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cm9n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cm9n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs3n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs3n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs3n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs3n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs3n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs3n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs3n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs3n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs5n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs5n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs5n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs5n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs5n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs5n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs5n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs5n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs8n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs8n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs8n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs8n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs8n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs8n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cs8n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cs8n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ct0n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ct0n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ct0n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ct0n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ct1n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ct1n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ct1n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ct1n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cten0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cten0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cten0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cten0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctfn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctfn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctfn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctfn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctgn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctgn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctgn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctgn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cthn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cthn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/cthn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/cthn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctjn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctjn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctjn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctjn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctzn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctzn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ctzn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ctzn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f00n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f00n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f00n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f00n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f00n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f00n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f00n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f00n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f01n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f01n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f01n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f01n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f01n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f01n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f01n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f01n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f02n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f02n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f02n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f02n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f02n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f02n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f02n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f02n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f03n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f03n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f03n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f03n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f03n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f03n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f03n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f03n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f04n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f04n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f04n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f04n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f04n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f04n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f04n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f04n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f99n0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f99n0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/f99n0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/f99n0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g03n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g03n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g04n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g04n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g05n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g05n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g07n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g07n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g10n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g10n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/g25n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/g25n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi1n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi1n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi1n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi1n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi1n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi1n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi1n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi1n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi2n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi2n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi2n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi2n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi2n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi2n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi2n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi2n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi4n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi4n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi4n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi4n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi4n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi4n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi4n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi4n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi9n0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi9n0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi9n0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi9n0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi9n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi9n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/oi9n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/oi9n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/pp0n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/pp0n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/pp0n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/pp0n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/pp0n6a08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/pp0n6a08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/pp0n6a08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/pp0n6a08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps1n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps1n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps1n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps1n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps1n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps1n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps1n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps1n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps2n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps2n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps2n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps2n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps2n2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps2n2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/ps2n2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/ps2n2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s01i3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s01i3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s01i3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s01i3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s01n3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s01n3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s01n3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s01n3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s02i3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s02i3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s02i3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s02i3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s02n3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s02n3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s02n3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s02n3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s03i3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s03i3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s03i3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s03i3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s03n3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s03n3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s03n3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s03n3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s04i3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s04i3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s04i3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s04i3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s04n3p01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s04n3p01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s04n3p01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s04n3p01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s05i3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s05i3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s05i3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s05i3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s05n3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s05n3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s05n3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s05n3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s06i3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s06i3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s06i3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s06i3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s06n3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s06n3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s06n3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s06n3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s07i3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s07i3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s07i3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s07i3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s07n3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s07n3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s07n3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s07n3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s08i3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s08i3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s08i3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s08i3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s08n3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s08n3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s08n3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s08n3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s09i3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s09i3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s09i3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s09i3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s09n3p02.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s09n3p02.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s09n3p02.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s09n3p02.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s32i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s32i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s32i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s32i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s32n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s32n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s32n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s32n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s33i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s33i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s33i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s33i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s33n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s33n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s33n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s33n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s34i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s34i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s34i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s34i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s34n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s34n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s34n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s34n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s35i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s35i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s35i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s35i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s35n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s35n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s35n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s35n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s36i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s36i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s36i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s36i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s36n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s36n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s36n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s36n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s37i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s37i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s37i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s37i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s37n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s37n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s37n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s37n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s38i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s38i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s38i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s38i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s38n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s38n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s38n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s38n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s39i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s39i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s39i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s39i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s39n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s39n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s39n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s39n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s40i3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s40i3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s40i3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s40i3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s40n3p04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s40n3p04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/s40n3p04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/s40n3p04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbbn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbbn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbgn2c16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbgn2c16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbgn2c16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbgn2c16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbgn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbgn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbgn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbgn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbrn2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbrn2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbrn2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbrn2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbwn0g16.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbwn0g16.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbwn0g16.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbwn0g16.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbwn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbwn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbwn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbwn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbyn3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbyn3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tbyn3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tbyn3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp0n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp0n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp1n3p08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp1n3p08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/tp1n3p08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/tp1n3p08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xc1n0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xc1n0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xc1n0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xc1n0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xc9n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xc9n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xc9n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xc9n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xcrn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xcrn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xcrn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xcrn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xcsn0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xcsn0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xcsn0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xcsn0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd0n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd0n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd0n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd0n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd3n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd3n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd3n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd3n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd9n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd9n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xd9n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xd9n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xdtn0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xdtn0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xdtn0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xdtn0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xhdn0g08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xhdn0g08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xhdn0g08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xhdn0g08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xlfn0g04.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xlfn0g04.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xlfn0g04.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xlfn0g04.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs1n0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs1n0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs1n0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs1n0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs2n0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs2n0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs2n0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs2n0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs4n0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs4n0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs4n0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs4n0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs7n0g01.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs7n0g01.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/xs7n0g01.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/xs7n0g01.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z00n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z00n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z00n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z00n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z03n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z03n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z03n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z03n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z06n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z06n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z06n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z06n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z09n2c08.png b/cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z09n2c08.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/PngTestSuite/z09n2c08.png rename to cortex-9.0.0-a10/test/IECore/data/png/PngTestSuite/z09n2c08.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/kodak_dx7590_test.png b/cortex-9.0.0-a10/test/IECore/data/png/kodak_dx7590_test.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/kodak_dx7590_test.png rename to cortex-9.0.0-a10/test/IECore/data/png/kodak_dx7590_test.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/kodak_dx7590_test_truncated.png b/cortex-9.0.0-a10/test/IECore/data/png/kodak_dx7590_test_truncated.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/kodak_dx7590_test_truncated.png rename to cortex-9.0.0-a10/test/IECore/data/png/kodak_dx7590_test_truncated.png diff --git a/cortex-9.0.0-a6/test/IECore/data/png/uvMap.512x256.8bit.png b/cortex-9.0.0-a10/test/IECore/data/png/uvMap.512x256.8bit.png similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/png/uvMap.512x256.8bit.png rename to cortex-9.0.0-a10/test/IECore/data/png/uvMap.512x256.8bit.png diff --git a/cortex-9.0.0-a6/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat b/cortex-9.0.0-a10/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat rename to cortex-9.0.0-a10/test/IECore/data/pointDistributions/pointDistributionTileSet2048.dat diff --git a/cortex-9.0.0-a6/test/IECore/data/ribFiles/dependencies.rib b/cortex-9.0.0-a10/test/IECore/data/ribFiles/dependencies.rib similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/ribFiles/dependencies.rib rename to cortex-9.0.0-a10/test/IECore/data/ribFiles/dependencies.rib diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/animatedSpheres.scc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/animatedSpheres.scc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/animatedSpheres.scc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/animatedSpheres.scc diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/attributeAtRoot.scc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/attributeAtRoot.scc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/attributeAtRoot.scc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/attributeAtRoot.scc diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/environment.lscc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/environment.lscc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/environment.lscc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/environment.lscc diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/environment_newTags.lscc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/environment_newTags.lscc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/environment_newTags.lscc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/environment_newTags.lscc diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/instancedSpheres.lscc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/instancedSpheres.lscc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/instancedSpheres.lscc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/instancedSpheres.lscc diff --git a/cortex-9.0.0-a6/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc b/cortex-9.0.0-a10/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc rename to cortex-9.0.0-a10/test/IECore/data/sccFiles/instancedSpheres_newTags.lscc diff --git a/cortex-9.0.0-a6/test/IECore/data/sgiFiles/maya.16bit.sgi b/cortex-9.0.0-a10/test/IECore/data/sgiFiles/maya.16bit.sgi similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sgiFiles/maya.16bit.sgi rename to cortex-9.0.0-a10/test/IECore/data/sgiFiles/maya.16bit.sgi diff --git a/cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi b/cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi rename to cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.16bit.sgi diff --git a/cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi b/cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi rename to cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.16bit.uncompressed.sgi diff --git a/cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi b/cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi rename to cortex-9.0.0-a10/test/IECore/data/sgiFiles/uvMap.512x256.8bit.sgi diff --git a/cortex-9.0.0-a6/test/IECore/data/swaFiles/test.swa b/cortex-9.0.0-a10/test/IECore/data/swaFiles/test.swa similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/swaFiles/test.swa rename to cortex-9.0.0-a10/test/IECore/data/swaFiles/test.swa diff --git a/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_BT709.tdl b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_BT709.tdl new file mode 100644 index 0000000000..e73c1dc04e Binary files /dev/null and b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_BT709.tdl differ diff --git a/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_linear.tdl b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_linear.tdl new file mode 100644 index 0000000000..2d64a9feb6 Binary files /dev/null and b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_linear.tdl differ diff --git a/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_srgb.tdl b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_srgb.tdl new file mode 100644 index 0000000000..4f07dc5320 Binary files /dev/null and b/cortex-9.0.0-a10/test/IECore/data/tdl/grey50_srgb.tdl differ diff --git a/cortex-9.0.0-a6/test/IECore/data/tgaFiles/uvMap.256x256.tga b/cortex-9.0.0-a10/test/IECore/data/tgaFiles/uvMap.256x256.tga similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tgaFiles/uvMap.256x256.tga rename to cortex-9.0.0-a10/test/IECore/data/tgaFiles/uvMap.256x256.tga diff --git a/cortex-9.0.0-a6/test/IECore/data/tgaFiles/uvMap.512x256.tga b/cortex-9.0.0-a10/test/IECore/data/tgaFiles/uvMap.512x256.tga similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tgaFiles/uvMap.512x256.tga rename to cortex-9.0.0-a10/test/IECore/data/tgaFiles/uvMap.512x256.tga diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.200x150.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.200x150.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.200x150.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.200x150.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.400x150.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.400x150.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.400x150.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.400x150.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.400x300.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.400x300.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.400x300.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.400x300.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.600x450.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.600x450.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/bluegreen_noise.600x450.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/bluegreen_noise.600x450.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/cropWindow.640x480.16bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/cropWindow.640x480.16bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/cropWindow.640x480.16bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/cropWindow.640x480.16bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/maya.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/maya.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/maya.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/maya.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/problem.tdl b/cortex-9.0.0-a10/test/IECore/data/tiff/problem.tdl similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/problem.tdl rename to cortex-9.0.0-a10/test/IECore/data/tiff/problem.tdl diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/pruned.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/pruned.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/pruned.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/pruned.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/rgbCheckerboard.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/rgbCheckerboard.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/rgbCheckerboard.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/rgbCheckerboard.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.1bit.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.2bit.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.4bit.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.tiff b/cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/rgb_black_circle.256x256.tiff rename to cortex-9.0.0-a10/test/IECore/data/tiff/rgb_black_circle.256x256.tiff diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/singlePixelT.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/singlePixelT.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/singlePixelT.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/singlePixelT.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/thinned.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/thinned.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/thinned.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/thinned.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/tilesWithLeftovers.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/tilesWithLeftovers.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/tilesWithLeftovers.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/tilesWithLeftovers.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/toThin.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/toThin.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/toThin.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/toThin.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/toTrace.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/toTrace.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/toTrace.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/toTrace.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/toTraceThinned.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/toTraceThinned.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/toTraceThinned.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/toTraceThinned.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.100x100.manyChannels.16bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.16bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.32bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.200x100.rgba.8bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.16bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.16bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.16bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.16bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.16bit.truncated.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.32bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.32bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.32bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.32bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.8bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.8bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.512x256.8bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.512x256.8bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.multiRes.32bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.multiRes.32bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMap.multiRes.32bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMap.multiRes.32bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif b/cortex-9.0.0-a10/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif rename to cortex-9.0.0-a10/test/IECore/data/tiff/uvMapUpsideDown.512x256.16bit.tif diff --git a/cortex-9.0.0-a6/test/IECore/ops/bad/bad-1.py b/cortex-9.0.0-a10/test/IECore/ops/bad/bad-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/bad/bad-1.py rename to cortex-9.0.0-a10/test/IECore/ops/bad/bad-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/classParameterTest/classParameterTest-1.py b/cortex-9.0.0-a10/test/IECore/ops/classParameterTest/classParameterTest-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/classParameterTest/classParameterTest-1.py rename to cortex-9.0.0-a10/test/IECore/ops/classParameterTest/classParameterTest-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py b/cortex-9.0.0-a10/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py rename to cortex-9.0.0-a10/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py b/cortex-9.0.0-a10/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py rename to cortex-9.0.0-a10/test/IECore/ops/classVectorParameterTest/classVectorParameterTest-2.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/colorSplineInput/colorSplineInput-1.py b/cortex-9.0.0-a10/test/IECore/ops/colorSplineInput/colorSplineInput-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/colorSplineInput/colorSplineInput-1.py rename to cortex-9.0.0-a10/test/IECore/ops/colorSplineInput/colorSplineInput-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py b/cortex-9.0.0-a10/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py rename to cortex-9.0.0-a10/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py b/cortex-9.0.0-a10/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py rename to cortex-9.0.0-a10/test/IECore/ops/compoundObjectInOut/compoundObjectInOut-2.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/floatParameter/floatParameter-1.py b/cortex-9.0.0-a10/test/IECore/ops/floatParameter/floatParameter-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/floatParameter/floatParameter-1.py rename to cortex-9.0.0-a10/test/IECore/ops/floatParameter/floatParameter-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py b/cortex-9.0.0-a10/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py rename to cortex-9.0.0-a10/test/IECore/ops/imagePrimitiveInOut/imagePrimitiveInOut-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/maths/multiply/multiply-1.py b/cortex-9.0.0-a10/test/IECore/ops/maths/multiply/multiply-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/maths/multiply/multiply-1.py rename to cortex-9.0.0-a10/test/IECore/ops/maths/multiply/multiply-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/maths/multiply/multiply-2.py b/cortex-9.0.0-a10/test/IECore/ops/maths/multiply/multiply-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/maths/multiply/multiply-2.py rename to cortex-9.0.0-a10/test/IECore/ops/maths/multiply/multiply-2.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/matrixParameter/matrixParameter-1.py b/cortex-9.0.0-a10/test/IECore/ops/matrixParameter/matrixParameter-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/matrixParameter/matrixParameter-1.py rename to cortex-9.0.0-a10/test/IECore/ops/matrixParameter/matrixParameter-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/mayaUserData/mayaUserData-1.py b/cortex-9.0.0-a10/test/IECore/ops/mayaUserData/mayaUserData-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/mayaUserData/mayaUserData-1.py rename to cortex-9.0.0-a10/test/IECore/ops/mayaUserData/mayaUserData-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/meshMerge/meshMerge-1.py b/cortex-9.0.0-a10/test/IECore/ops/meshMerge/meshMerge-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/meshMerge/meshMerge-1.py rename to cortex-9.0.0-a10/test/IECore/ops/meshMerge/meshMerge-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py b/cortex-9.0.0-a10/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py rename to cortex-9.0.0-a10/test/IECore/ops/objectVectorInOut/objectVectorInOut-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/parameterTypes/parameterTypes-1.py b/cortex-9.0.0-a10/test/IECore/ops/parameterTypes/parameterTypes-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/parameterTypes/parameterTypes-1.py rename to cortex-9.0.0-a10/test/IECore/ops/parameterTypes/parameterTypes-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/path.With.Dot/multiply/multiply-1.py b/cortex-9.0.0-a10/test/IECore/ops/path.With.Dot/multiply/multiply-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/path.With.Dot/multiply/multiply-1.py rename to cortex-9.0.0-a10/test/IECore/ops/path.With.Dot/multiply/multiply-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/presetParsing/presetParsing-1.py b/cortex-9.0.0-a10/test/IECore/ops/presetParsing/presetParsing-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/presetParsing/presetParsing-1.py rename to cortex-9.0.0-a10/test/IECore/ops/presetParsing/presetParsing-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/splineInput/splineInput-1.py b/cortex-9.0.0-a10/test/IECore/ops/splineInput/splineInput-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/splineInput/splineInput-1.py rename to cortex-9.0.0-a10/test/IECore/ops/splineInput/splineInput-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/stringParsing/stringParsing-1.py b/cortex-9.0.0-a10/test/IECore/ops/stringParsing/stringParsing-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/stringParsing/stringParsing-1.py rename to cortex-9.0.0-a10/test/IECore/ops/stringParsing/stringParsing-1.py diff --git a/cortex-9.0.0-a6/test/IECore/ops/unstorable/unstorable-1.py b/cortex-9.0.0-a10/test/IECore/ops/unstorable/unstorable-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/ops/unstorable/unstorable-1.py rename to cortex-9.0.0-a10/test/IECore/ops/unstorable/unstorable-1.py diff --git a/cortex-9.0.0-a6/test/IECore/procedurals/image/image-1.py b/cortex-9.0.0-a10/test/IECore/procedurals/image/image-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/procedurals/image/image-1.py rename to cortex-9.0.0-a10/test/IECore/procedurals/image/image-1.py diff --git a/cortex-9.0.0-a6/test/IECore/procedurals/read/read-1.py b/cortex-9.0.0-a10/test/IECore/procedurals/read/read-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECore/procedurals/read/read-1.py rename to cortex-9.0.0-a10/test/IECore/procedurals/read/read-1.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/All.py b/cortex-9.0.0-a10/test/IECoreGL/All.py similarity index 98% rename from cortex-9.0.0-a6/test/IECoreGL/All.py rename to cortex-9.0.0-a10/test/IECoreGL/All.py index 1e03242c41..dbf0a21e4f 100644 --- a/cortex-9.0.0-a6/test/IECoreGL/All.py +++ b/cortex-9.0.0-a10/test/IECoreGL/All.py @@ -67,6 +67,7 @@ from ShadingTest import ShadingTest from ShaderLoaderTest import ShaderLoaderTest from ShaderStateComponentTest import ShaderStateComponentTest +from ToGLStateConverterTest import ToGLStateConverterTest if IECore.withFreeType() : diff --git a/cortex-9.0.0-a6/test/IECoreGL/AlphaTextureTest.py b/cortex-9.0.0-a10/test/IECoreGL/AlphaTextureTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/AlphaTextureTest.py rename to cortex-9.0.0-a10/test/IECoreGL/AlphaTextureTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/BufferTest.py b/cortex-9.0.0-a10/test/IECoreGL/BufferTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/BufferTest.py rename to cortex-9.0.0-a10/test/IECoreGL/BufferTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/CachedConverterTest.py b/cortex-9.0.0-a10/test/IECoreGL/CachedConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/CachedConverterTest.py rename to cortex-9.0.0-a10/test/IECoreGL/CachedConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Camera.py b/cortex-9.0.0-a10/test/IECoreGL/Camera.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Camera.py rename to cortex-9.0.0-a10/test/IECoreGL/Camera.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/CoordinateSystemTest.py b/cortex-9.0.0-a10/test/IECoreGL/CoordinateSystemTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/CoordinateSystemTest.py rename to cortex-9.0.0-a10/test/IECoreGL/CoordinateSystemTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/CurvesPrimitiveTest.py b/cortex-9.0.0-a10/test/IECoreGL/CurvesPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/CurvesPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECoreGL/CurvesPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/DeferredRenderer.py b/cortex-9.0.0-a10/test/IECoreGL/DeferredRenderer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/DeferredRenderer.py rename to cortex-9.0.0-a10/test/IECoreGL/DeferredRenderer.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/DiskPrimitiveTest.py b/cortex-9.0.0-a10/test/IECoreGL/DiskPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/DiskPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECoreGL/DiskPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/FontLoaderTest.py b/cortex-9.0.0-a10/test/IECoreGL/FontLoaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/FontLoaderTest.py rename to cortex-9.0.0-a10/test/IECoreGL/FontLoaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/FontTest.py b/cortex-9.0.0-a10/test/IECoreGL/FontTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/FontTest.py rename to cortex-9.0.0-a10/test/IECoreGL/FontTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Group.py b/cortex-9.0.0-a10/test/IECoreGL/Group.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Group.py rename to cortex-9.0.0-a10/test/IECoreGL/Group.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/HitRecord.py b/cortex-9.0.0-a10/test/IECoreGL/HitRecord.py similarity index 90% rename from cortex-9.0.0-a6/test/IECoreGL/HitRecord.py rename to cortex-9.0.0-a10/test/IECoreGL/HitRecord.py index 75318d2add..c377fc61f2 100644 --- a/cortex-9.0.0-a6/test/IECoreGL/HitRecord.py +++ b/cortex-9.0.0-a10/test/IECoreGL/HitRecord.py @@ -44,17 +44,17 @@ class TestHitRecord( unittest.TestCase ) : def test( self ) : - d = HitRecord( 1, 2, InternedString( "hello" ) ) + d = HitRecord( 1, 2, 1 ) self.assertEqual( d.depthMin, 1 ) self.assertEqual( d.depthMax, 2 ) - self.assertEqual( d.name, InternedString( "hello" ) ) + self.assertEqual( d.name, 1 ) - d2 = HitRecord( 1.5, 2, InternedString( "goodbye" ) ) + d2 = HitRecord( 1.5, 2, 2 ) self.assertEqual( d2.depthMin, 1.5 ) self.assertEqual( d2.depthMax, 2 ) - self.assertEqual( d2.name, InternedString( "goodbye" ) ) + self.assertEqual( d2.name, 2 ) self.assert_( d < d2 ) diff --git a/cortex-9.0.0-a6/test/IECoreGL/Image.py b/cortex-9.0.0-a10/test/IECoreGL/Image.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Image.py rename to cortex-9.0.0-a10/test/IECoreGL/Image.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/ImmediateRenderer.py b/cortex-9.0.0-a10/test/IECoreGL/ImmediateRenderer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ImmediateRenderer.py rename to cortex-9.0.0-a10/test/IECoreGL/ImmediateRenderer.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/InstancingTest.py b/cortex-9.0.0-a10/test/IECoreGL/InstancingTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/InstancingTest.py rename to cortex-9.0.0-a10/test/IECoreGL/InstancingTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/LuminanceTextureTest.py b/cortex-9.0.0-a10/test/IECoreGL/LuminanceTextureTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/LuminanceTextureTest.py rename to cortex-9.0.0-a10/test/IECoreGL/LuminanceTextureTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/MeshPrimitiveTest.py b/cortex-9.0.0-a10/test/IECoreGL/MeshPrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/MeshPrimitiveTest.py rename to cortex-9.0.0-a10/test/IECoreGL/MeshPrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/NameStateComponent.py b/cortex-9.0.0-a10/test/IECoreGL/NameStateComponent.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/NameStateComponent.py rename to cortex-9.0.0-a10/test/IECoreGL/NameStateComponent.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Orientation.py b/cortex-9.0.0-a10/test/IECoreGL/Orientation.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Orientation.py rename to cortex-9.0.0-a10/test/IECoreGL/Orientation.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/PointsPrimitive.py b/cortex-9.0.0-a10/test/IECoreGL/PointsPrimitive.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/PointsPrimitive.py rename to cortex-9.0.0-a10/test/IECoreGL/PointsPrimitive.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/PrimitiveTest.py b/cortex-9.0.0-a10/test/IECoreGL/PrimitiveTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/PrimitiveTest.py rename to cortex-9.0.0-a10/test/IECoreGL/PrimitiveTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Renderer.py b/cortex-9.0.0-a10/test/IECoreGL/Renderer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Renderer.py rename to cortex-9.0.0-a10/test/IECoreGL/Renderer.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Selection.py b/cortex-9.0.0-a10/test/IECoreGL/Selection.py similarity index 90% rename from cortex-9.0.0-a6/test/IECoreGL/Selection.py rename to cortex-9.0.0-a10/test/IECoreGL/Selection.py index 68791a74e9..5feae904f7 100644 --- a/cortex-9.0.0-a6/test/IECoreGL/Selection.py +++ b/cortex-9.0.0-a10/test/IECoreGL/Selection.py @@ -68,7 +68,7 @@ def testSelect( self ) : s.setCamera( IECoreGL.PerspectiveCamera() ) ss = s.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( len( names ), 3 ) self.assert_( "one" in names ) self.assert_( "two" in names ) @@ -109,19 +109,19 @@ def testRegionSelect( self ) : ss = s.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0, 0.5 ), IECore.V2f( 0.5, 1 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "red" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "red" ) ss = s.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 0.5 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "green" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "green" ) ss = s.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0.5, 0 ), IECore.V2f( 1, 0.5 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "blue" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "blue" ) ss = s.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0.5 ), IECore.V2f( 1 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "white" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "white" ) def testIDSelect( self ) : @@ -153,11 +153,11 @@ def testIDSelect( self ) : ss = s.select( IECoreGL.Selector.Mode.IDRender, IECore.Box2f( IECore.V2f( 0.25, 0.5 ), IECore.V2f( 0.26, 0.51 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "frontLeft" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "frontLeft" ) ss = s.select( IECoreGL.Selector.Mode.IDRender, IECore.Box2f( IECore.V2f( 0.75, 0.5 ), IECore.V2f( 0.76, 0.51 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "frontRight" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "frontRight" ) def testIDSelectDepths( self ) : @@ -176,11 +176,11 @@ def testIDSelectDepths( self ) : s1 = scene.select( IECoreGL.Selector.Mode.GLSelect, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) self.assertEqual( len( s1 ), 1 ) - self.assertEqual( s1[0].name.value(), "ball" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( s1[0].name ), "ball" ) s2 = scene.select( IECoreGL.Selector.Mode.IDRender, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) self.assertEqual( len( s2 ), 1 ) - self.assertEqual( s2[0].name.value(), "ball" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( s2[0].name ), "ball" ) self.assertAlmostEqual( s1[0].depthMin, s2[0].depthMin, 5 ) @@ -214,11 +214,11 @@ def testOcclusionQuerySelect( self ) : ss = s.select( IECoreGL.Selector.Mode.OcclusionQuery, IECore.Box2f( IECore.V2f( 0, 0 ), IECore.V2f( 0.25, 1 ) ) ) self.assertEqual( len( ss ), 2 ) - self.assertEqual( set( [ x.name.value() for x in ss ] ), set( ( "frontLeft", "backLeft" ) ) ) + self.assertEqual( set( [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] ), set( ( "frontLeft", "backLeft" ) ) ) ss = s.select( IECoreGL.Selector.Mode.OcclusionQuery, IECore.Box2f( IECore.V2f( 0.75, 0 ), IECore.V2f( 1, 1 ) ) ) self.assertEqual( len( ss ), 2 ) - self.assertEqual( set( [ x.name.value() for x in ss ] ), set( ( "frontRight", "backRight" ) ) ) + self.assertEqual( set( [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] ), set( ( "frontRight", "backRight" ) ) ) def testIDSelectWithAdditionalDisplayStyles( self ) : @@ -255,11 +255,11 @@ def testIDSelectWithAdditionalDisplayStyles( self ) : ss = s.select( IECoreGL.Selector.Mode.IDRender, IECore.Box2f( IECore.V2f( 0.25, 0.5 ), IECore.V2f( 0.26, 0.51 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "frontLeft" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "frontLeft" ) ss = s.select( IECoreGL.Selector.Mode.IDRender, IECore.Box2f( IECore.V2f( 0.75, 0.5 ), IECore.V2f( 0.76, 0.51 ) ) ) self.assertEqual( len( ss ), 1 ) - self.assertEqual( ss[0].name.value(), "frontRight" ) + self.assertEqual( IECoreGL.NameStateComponent.nameFromGLName( ss[0].name ), "frontRight" ) def testPointsPrimitiveSelect( self ) : @@ -279,7 +279,7 @@ def testPointsPrimitiveSelect( self ) : for mode in ( IECoreGL.Selector.Mode.GLSelect, IECoreGL.Selector.Mode.OcclusionQuery, IECoreGL.Selector.Mode.IDRender ) : ss = s.select( mode, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( len( names ), 1 ) self.assertEqual( names[0], "pointsNeedSelectingToo" ) @@ -312,7 +312,7 @@ def testCurvesPrimitiveSelect( self ) : for mode in ( IECoreGL.Selector.Mode.GLSelect, IECoreGL.Selector.Mode.OcclusionQuery, IECoreGL.Selector.Mode.IDRender ) : ss = s.select( mode, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( len( names ), 1 ) self.assertEqual( names[0], "curvesNeedSelectingToo" ) @@ -346,7 +346,7 @@ def testCurvesPrimitiveSelectUsingLines( self ) : for mode in ( IECoreGL.Selector.Mode.GLSelect, IECoreGL.Selector.Mode.OcclusionQuery, IECoreGL.Selector.Mode.IDRender ) : ss = s.select( mode, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( len( names ), 1 ) self.assertEqual( names[0], "curvesNeedSelectingToo" ) @@ -382,7 +382,7 @@ def testCurvesPrimitiveSelectUsingWireframeLines( self ) : for mode in ( IECoreGL.Selector.Mode.GLSelect, IECoreGL.Selector.Mode.OcclusionQuery, IECoreGL.Selector.Mode.IDRender ) : ss = s.select( mode, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( len( names ), 1 ) self.assertEqual( names[0], "curvesNeedSelectingToo" ) @@ -415,7 +415,7 @@ def testContextManager( self ) : selector.baseState().bind() scene.root().render( selector.baseState() ) - names = [ x.name.value() for x in hits ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in hits ] self.assertEqual( len( names ), 2 ) self.assert_( "one" in names ) self.assert_( "two" in names ) @@ -445,7 +445,7 @@ def testSelectableFlag( self ) : for mode in ( IECoreGL.Selector.Mode.GLSelect, IECoreGL.Selector.Mode.OcclusionQuery, IECoreGL.Selector.Mode.IDRender ) : ss = s.select( mode, IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) - names = [ x.name.value() for x in ss ] + names = [ IECoreGL.NameStateComponent.nameFromGLName( x.name ) for x in ss ] self.assertEqual( names, [ "selectableObj" ] ) if __name__ == "__main__": diff --git a/cortex-9.0.0-a6/test/IECoreGL/Shader.py b/cortex-9.0.0-a10/test/IECoreGL/Shader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Shader.py rename to cortex-9.0.0-a10/test/IECoreGL/Shader.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/ShaderLoaderTest.py b/cortex-9.0.0-a10/test/IECoreGL/ShaderLoaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ShaderLoaderTest.py rename to cortex-9.0.0-a10/test/IECoreGL/ShaderLoaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/ShaderStateComponentTest.py b/cortex-9.0.0-a10/test/IECoreGL/ShaderStateComponentTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ShaderStateComponentTest.py rename to cortex-9.0.0-a10/test/IECoreGL/ShaderStateComponentTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/ShadingTest.py b/cortex-9.0.0-a10/test/IECoreGL/ShadingTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ShadingTest.py rename to cortex-9.0.0-a10/test/IECoreGL/ShadingTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/State.py b/cortex-9.0.0-a10/test/IECoreGL/State.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/State.py rename to cortex-9.0.0-a10/test/IECoreGL/State.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/TextTest.py b/cortex-9.0.0-a10/test/IECoreGL/TextTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/TextTest.py rename to cortex-9.0.0-a10/test/IECoreGL/TextTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/Texture.py b/cortex-9.0.0-a10/test/IECoreGL/Texture.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/Texture.py rename to cortex-9.0.0-a10/test/IECoreGL/Texture.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/TextureLoaderTest.py b/cortex-9.0.0-a10/test/IECoreGL/TextureLoaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/TextureLoaderTest.py rename to cortex-9.0.0-a10/test/IECoreGL/TextureLoaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/ToGLConverterTest.py b/cortex-9.0.0-a10/test/IECoreGL/ToGLConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ToGLConverterTest.py rename to cortex-9.0.0-a10/test/IECoreGL/ToGLConverterTest.py diff --git a/cortex-9.0.0-a10/test/IECoreGL/ToGLStateConverterTest.py b/cortex-9.0.0-a10/test/IECoreGL/ToGLStateConverterTest.py new file mode 100644 index 0000000000..9fa5f7e408 --- /dev/null +++ b/cortex-9.0.0-a10/test/IECoreGL/ToGLStateConverterTest.py @@ -0,0 +1,102 @@ +########################################################################## +# +# Copyright (c) 2014, 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. +# +########################################################################## + +import unittest + +import IECore +import IECoreGL + +IECoreGL.init( False ) + +class ToGLStateConverterTest( unittest.TestCase ) : + + def test( self ) : + + attributes = [ + ( "doubleSided", IECore.BoolData( True ), IECoreGL.DoubleSidedStateComponent( True ) ), + ( "gl:primitive:wireframe", IECore.BoolData( True ), IECoreGL.Primitive.DrawWireframe( True ) ), + ( "gl:primitive:wireframeWidth", IECore.FloatData( 2.5 ), IECoreGL.Primitive.WireframeWidth( 2.5 ) ), + ( "gl:primitive:wireframeColor", IECore.Color4fData( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ), IECoreGL.WireframeColorStateComponent( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ) ), + ( "gl:primitive:bound", IECore.BoolData( True ), IECoreGL.Primitive.DrawBound( True ) ), + ( "gl:primitive:boundColor", IECore.Color4fData( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ), IECoreGL.BoundColorStateComponent( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ) ), + ( "gl:primitive:solid", IECore.BoolData( True ), IECoreGL.Primitive.DrawSolid( True ) ), + ( "gl:primitive:points", IECore.BoolData( True ), IECoreGL.Primitive.DrawPoints( True ) ), + ( "gl:primitive:pointWidth", IECore.FloatData( 2.5 ), IECoreGL.Primitive.PointWidth( 2.5 ) ), + ( "gl:primitive:pointColor", IECore.Color4fData( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ), IECoreGL.PointColorStateComponent( IECore.Color4f( 0.1, 0.25, 0.5, 1 ) ) ), + ( "gl:pointsPrimitive:useGLPoints", IECore.StringData( "forGLPoints" ), IECoreGL.PointsPrimitive.UseGLPoints( IECoreGL.GLPointsUsage.ForPointsOnly ) ), + ( "gl:pointsPrimitive:glPointWidth", IECore.FloatData( 1.5 ), IECoreGL.PointsPrimitive.GLPointWidth( 1.5 ) ), + ( "gl:curvesPrimitive:useGLLines", IECore.BoolData( True ), IECoreGL.CurvesPrimitive.UseGLLines( True ) ), + ( "gl:curvesPrimitive:glLineWidth", IECore.FloatData( 1.5 ), IECoreGL.CurvesPrimitive.GLLineWidth( 1.5 ) ), + ( "gl:curvesPrimitive:ignoreBasis", IECore.BoolData( True ), IECoreGL.CurvesPrimitive.IgnoreBasis( True ) ), + ( "gl:smoothing:points", IECore.BoolData( True ), IECoreGL.PointSmoothingStateComponent( True ) ), + ( "gl:smoothing:lines", IECore.BoolData( True ), IECoreGL.LineSmoothingStateComponent( True ) ), + ( "gl:smoothing:polygons", IECore.BoolData( True ), IECoreGL.PolygonSmoothingStateComponent( True ) ), + ] + + for name, value, component in attributes : + a = IECore.CompoundObject() + a[name] = value + s = IECoreGL.ToGLStateConverter( a ).convert() + c = s.get( component.typeId() ) + self.assertEqual( c.typeId(), component.typeId() ) + self.assertEqual( c.value, component.value ) + + def testShaderAttribute( self ) : + + vertexSource = """ + void main() + { + gl_Position = ftransform(); + } + """ + + fragmentSource = """ + void main() + { + gl_FragColor = vec4( 1, 0.5, 0.25, 1 ); + } + """ + + shader = IECore.Shader( "test", "surface", { "gl:vertexSource" : vertexSource, "gl:fragmentSource" : fragmentSource } ) + attributes = IECore.CompoundObject( { "gl:surface" : shader } ) + state = IECoreGL.ToGLStateConverter( attributes ).convert() + + shaderState = state.get( IECoreGL.ShaderStateComponent ) + self.assertTrue( isinstance( shaderState, IECoreGL.ShaderStateComponent ) ) + glShader = shaderState.shaderSetup().shader() + self.assertTrue( glShader.vertexSource(), vertexSource ) + self.assertTrue( glShader.fragmentSource(), fragmentSource ) + +if __name__ == "__main__": + unittest.main() diff --git a/cortex-9.0.0-a6/test/IECoreGL/ToGLTextureConverter.py b/cortex-9.0.0-a10/test/IECoreGL/ToGLTextureConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/ToGLTextureConverter.py rename to cortex-9.0.0-a10/test/IECoreGL/ToGLTextureConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/UserAttributesTest.py b/cortex-9.0.0-a10/test/IECoreGL/UserAttributesTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/UserAttributesTest.py rename to cortex-9.0.0-a10/test/IECoreGL/UserAttributesTest.py diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedOrthographicPatches.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedOrthographicPoints.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedPerspectivePatches.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/aimedPerspectivePoints.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/glPoints.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/glPoints.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/glPoints.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/glPoints.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithConstantColor.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithUniformColor.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/linearLinesWithVertexColor.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/meshST.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/meshST.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/meshST.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/meshST.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/pointVertexAttributes.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/pointVertexAttributes.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/pointVertexAttributes.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/pointVertexAttributes.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/proceduralTest.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/proceduralTest.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/proceduralTest.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/proceduralTest.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/rotatedPointPatches.exr b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/rotatedPointPatches.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/rotatedPointPatches.exr rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/rotatedPointPatches.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif b/cortex-9.0.0-a10/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif rename to cortex-9.0.0-a10/test/IECoreGL/expectedOutput/twoBSplineCirclesAsLines.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/a.tif b/cortex-9.0.0-a10/test/IECoreGL/images/a.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/a.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/a.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/bSplineCircle.tif b/cortex-9.0.0-a10/test/IECoreGL/images/bSplineCircle.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/bSplineCircle.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/bSplineCircle.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/bezierHorseShoe.tif b/cortex-9.0.0-a10/test/IECoreGL/images/bezierHorseShoe.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/bezierHorseShoe.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/bezierHorseShoe.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsH512x512.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsH512x512.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsH512x512.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsH512x512.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsH640x480.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsH640x480.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsH640x480.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsH640x480.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaF512x512.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaF640x480.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaH512x512.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr b/cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/colorBarsWithAlphaH640x480.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/disk.tif b/cortex-9.0.0-a10/test/IECoreGL/images/disk.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/disk.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/disk.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/helloWorld.tif b/cortex-9.0.0-a10/test/IECoreGL/images/helloWorld.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/helloWorld.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/helloWorld.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/helloWorldSprites.tif b/cortex-9.0.0-a10/test/IECoreGL/images/helloWorldSprites.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/helloWorldSprites.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/helloWorldSprites.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/linearHorseShoeRibbon.tif b/cortex-9.0.0-a10/test/IECoreGL/images/linearHorseShoeRibbon.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/linearHorseShoeRibbon.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/linearHorseShoeRibbon.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/linearPeriodicRibbon.tif b/cortex-9.0.0-a10/test/IECoreGL/images/linearPeriodicRibbon.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/linearPeriodicRibbon.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/linearPeriodicRibbon.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/numberWithAlpha.exr b/cortex-9.0.0-a10/test/IECoreGL/images/numberWithAlpha.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/numberWithAlpha.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/numberWithAlpha.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/numbers.exr b/cortex-9.0.0-a10/test/IECoreGL/images/numbers.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/numbers.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/numbers.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/numbersWithAlpha.exr b/cortex-9.0.0-a10/test/IECoreGL/images/numbersWithAlpha.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/numbersWithAlpha.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/numbersWithAlpha.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/periodicBSpline.tif b/cortex-9.0.0-a10/test/IECoreGL/images/periodicBSpline.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/periodicBSpline.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/periodicBSpline.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/twoBSplineCircles.tif b/cortex-9.0.0-a10/test/IECoreGL/images/twoBSplineCircles.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/twoBSplineCircles.tif rename to cortex-9.0.0-a10/test/IECoreGL/images/twoBSplineCircles.tif diff --git a/cortex-9.0.0-a6/test/IECoreGL/images/yellow.exr b/cortex-9.0.0-a10/test/IECoreGL/images/yellow.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/images/yellow.exr rename to cortex-9.0.0-a10/test/IECoreGL/images/yellow.exr diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt b/cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt rename to cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/3Dlabs-license.txt diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Mandel.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Mandel.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Mandel.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Mandel.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Mandel.vert b/cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Mandel.vert similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Mandel.vert rename to cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Mandel.vert diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Toon.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Toon.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Toon.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Toon.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Toon.vert b/cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Toon.vert similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/3dLabs/Toon.vert rename to cortex-9.0.0-a10/test/IECoreGL/shaders/3dLabs/Toon.vert diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/badPreprocessingDirective.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/badPreprocessingDirective.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/badPreprocessingDirective.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/badPreprocessingDirective.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/color.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/color.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/color.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/color.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/failWithoutPreprocessing.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/failWithoutPreprocessing.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/failWithoutPreprocessing.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/failWithoutPreprocessing.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/grey.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/grey.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/grey.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/grey.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/image.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/image.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/image.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/image.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/include/macros.h b/cortex-9.0.0-a10/test/IECoreGL/shaders/include/macros.h similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/include/macros.h rename to cortex-9.0.0-a10/test/IECoreGL/shaders/include/macros.h diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/pointTripler.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/pointTripler.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/pointTripler.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/pointTripler.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/pointTripler.geom b/cortex-9.0.0-a10/test/IECoreGL/shaders/pointTripler.geom similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/pointTripler.geom rename to cortex-9.0.0-a10/test/IECoreGL/shaders/pointTripler.geom diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/rgbColor.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/rgbColor.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/rgbColor.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/rgbColor.frag diff --git a/cortex-9.0.0-a6/test/IECoreGL/shaders/versionAndExtension.frag b/cortex-9.0.0-a10/test/IECoreGL/shaders/versionAndExtension.frag similarity index 100% rename from cortex-9.0.0-a6/test/IECoreGL/shaders/versionAndExtension.frag rename to cortex-9.0.0-a10/test/IECoreGL/shaders/versionAndExtension.frag diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ActiveTake.py b/cortex-9.0.0-a10/test/IECoreHoudini/ActiveTake.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ActiveTake.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ActiveTake.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/All.py b/cortex-9.0.0-a10/test/IECoreHoudini/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/All.py rename to cortex-9.0.0-a10/test/IECoreHoudini/All.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/AttributeRemap.py b/cortex-9.0.0-a10/test/IECoreHoudini/AttributeRemap.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/AttributeRemap.py rename to cortex-9.0.0-a10/test/IECoreHoudini/AttributeRemap.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/CobIOTranslator.py b/cortex-9.0.0-a10/test/IECoreHoudini/CobIOTranslator.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/CobIOTranslator.py rename to cortex-9.0.0-a10/test/IECoreHoudini/CobIOTranslator.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/CortexConverterSop.py b/cortex-9.0.0-a10/test/IECoreHoudini/CortexConverterSop.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/CortexConverterSop.py rename to cortex-9.0.0-a10/test/IECoreHoudini/CortexConverterSop.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/CortexRmanInject.py b/cortex-9.0.0-a10/test/IECoreHoudini/CortexRmanInject.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/CortexRmanInject.py rename to cortex-9.0.0-a10/test/IECoreHoudini/CortexRmanInject.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/CortexWriter.py b/cortex-9.0.0-a10/test/IECoreHoudini/CortexWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/CortexWriter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/CortexWriter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/DeepImageConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/DeepImageConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/DeepImageConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/DeepImageConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniCurvesConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniCurvesConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniCurvesConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniCurvesConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniGroupConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniGroupConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniGroupConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniGroupConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniPointsConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniPointsConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniPointsConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniPointsConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniPolygonsConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniPolygonsConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/FromHoudiniPolygonsConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/FromHoudiniPolygonsConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/InterpolatedCacheReader.py b/cortex-9.0.0-a10/test/IECoreHoudini/InterpolatedCacheReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/InterpolatedCacheReader.py rename to cortex-9.0.0-a10/test/IECoreHoudini/InterpolatedCacheReader.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/LiveSceneTest.py b/cortex-9.0.0-a10/test/IECoreHoudini/LiveSceneTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/LiveSceneTest.py rename to cortex-9.0.0-a10/test/IECoreHoudini/LiveSceneTest.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/NodeHandle.py b/cortex-9.0.0-a10/test/IECoreHoudini/NodeHandle.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/NodeHandle.py rename to cortex-9.0.0-a10/test/IECoreHoudini/NodeHandle.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/OpHolder.py b/cortex-9.0.0-a10/test/IECoreHoudini/OpHolder.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/OpHolder.py rename to cortex-9.0.0-a10/test/IECoreHoudini/OpHolder.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ProceduralHolder.py b/cortex-9.0.0-a10/test/IECoreHoudini/ProceduralHolder.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ProceduralHolder.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ProceduralHolder.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/RATDeepImageReaderTest.py b/cortex-9.0.0-a10/test/IECoreHoudini/RATDeepImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/RATDeepImageReaderTest.py rename to cortex-9.0.0-a10/test/IECoreHoudini/RATDeepImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/RATDeepImageWriterTest.py b/cortex-9.0.0-a10/test/IECoreHoudini/RATDeepImageWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/RATDeepImageWriterTest.py rename to cortex-9.0.0-a10/test/IECoreHoudini/RATDeepImageWriterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/SceneCacheTest.py b/cortex-9.0.0-a10/test/IECoreHoudini/SceneCacheTest.py similarity index 98% rename from cortex-9.0.0-a6/test/IECoreHoudini/SceneCacheTest.py rename to cortex-9.0.0-a10/test/IECoreHoudini/SceneCacheTest.py index 27a3b91e76..3d3be7e6ec 100644 --- a/cortex-9.0.0-a6/test/IECoreHoudini/SceneCacheTest.py +++ b/cortex-9.0.0-a10/test/IECoreHoudini/SceneCacheTest.py @@ -532,8 +532,9 @@ def writeTestFile() : # P is transformed self.assertEqual( prims[0].vertex( 0 ).point().position(), hou.Vector3( 6, 0, 0 ) ) # other Point data is as well - self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "rest" ), ( 6, 0, 0 ) ) self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "otherP" ), ( 6, 0, 0 ) ) + # rest is not transformed + self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "rest" ), ( 0, 0, 0 ) ) # other data is not self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "Cd" ), ( 0, 0, 1 ) ) @@ -664,8 +665,12 @@ def testSopAttributeCopy( self ) : self.assertEqual( sorted( [ x.name() for x in node.geometry().primAttribs() ] ), ["Cd", "ieMeshInterpolation", "name"] ) self.assertEqual( node.geometry().vertexAttribs(), tuple() ) self.assertEqual( node.geometry().globalAttribs(), tuple() ) + # ensure the rest does not transform along with P by making sure it matches the static P + original = IECore.MeshPrimitive.createBox(IECore.Box3f(IECore.V3f(0),IECore.V3f(1))) for point in node.geometry().points() : - self.assertEqual( point.attribValue( "P" ), point.attribValue( "rest" ) ) + rest = point.attribValue( "rest" ) + self.assertNotEqual( point.attribValue( "P" ), rest ) + self.assertEqual( original["P"].data[ point.number() % 8 ], IECore.V3f( rest[0], rest[1], rest[2] ) ) # copying multiple prim vars node.parm( "attributeCopy" ).set( "P:Pref Cs:Cspecial" ) @@ -674,8 +679,11 @@ def testSopAttributeCopy( self ) : self.assertEqual( sorted( [ x.name() for x in node.geometry().primAttribs() ] ), ["Cd", "Cspecial", "ieMeshInterpolation", "name"] ) self.assertEqual( node.geometry().vertexAttribs(), tuple() ) self.assertEqual( node.geometry().globalAttribs(), tuple() ) + # ensure the rest does not transform along with P by making sure it matches the static P for point in node.geometry().points() : - self.assertEqual( point.attribValue( "P" ), point.attribValue( "rest" ) ) + rest = point.attribValue( "rest" ) + self.assertNotEqual( point.attribValue( "P" ), rest ) + self.assertEqual( original["P"].data[ point.number() % 8 ], IECore.V3f( rest[0], rest[1], rest[2] ) ) for prim in node.geometry().prims() : self.assertEqual( prim.attribValue( "Cd" ), prim.attribValue( "Cspecial" ) ) @@ -710,7 +718,8 @@ def testSopAttributeCopy( self ) : for key in result.keys() : self.assertTrue( isinstance( result[key], IECore.MeshPrimitive ) ) self.assertEqual( sorted( result[key].keys() ), [ "Cs", "P", "Pref" ] ) - self.assertEqual( result[key]["P"], result[key]["Pref"] ) + self.assertNotEqual( result[key]["P"], result[key]["Pref"] ) + self.assertEqual( original["P"], result[key]["Pref"] ) def testExpandGeo( self ) : @@ -1821,6 +1830,39 @@ def testSopXformSpaces( self ) : self.assertEqual( prims[6].vertex( 0 ).point().position(), hou.Vector3( 0.5, -0.5, -0.5 ) ) self.assertEqual( prims[12].vertex( 0 ).point().position(), hou.Vector3( 0.5, -0.5, -0.5 ) ) + def testSopXformRestDoesNotTransform( self ) : + + self.writeAnimSCC() + + times = range( 0, 10 ) + halves = [ x + 0.5 for x in times ] + quarters = [ x + 0.25 for x in times ] + times.extend( [ x + 0.75 for x in times ] ) + times.extend( halves ) + times.extend( quarters ) + times.sort() + + spf = 1.0 / hou.fps() + + source = self.sop() + source.parm( "geometryType" ).set( IECoreHoudini.SceneCacheNode.GeometryType.Houdini ) + source.parm( "attributeCopy" ).set( "P:Pref" ) + xform = source.createOutputNode( "ieSceneCacheTransform" ) + xform.parm( "file" ).set( TestSceneCache.__testFile ) + + for time in times : + hou.setTime( time - spf ) + prims = xform.geometry().prims() + self.assertEqual( len(prims), 18 ) + # positions are double transformed (once by the source sop and once by the xform) + self.assertEqual( prims[0].vertex( 0 ).point().position(), hou.Vector3( 2, 2*time, 0 ) ) + self.assertEqual( prims[6].vertex( 0 ).point().position(), hou.Vector3( 6, 4*time, 0 ) ) + self.assertEqual( prims[12].vertex( 0 ).point().position(), hou.Vector3( 12, 6*time, 0 ) ) + # rest doesn't transform from either source or xform + self.assertEqual( prims[0].vertex( 0 ).point().attribValue( "rest" ), ( 0, 0, 0 ) ) + self.assertEqual( prims[6].vertex( 0 ).point().attribValue( "rest" ), ( 0, 0, 0 ) ) + self.assertEqual( prims[12].vertex( 0 ).point().attribValue( "rest" ), ( 0, 0, 0 ) ) + def testOBJOutputParms( self ) : self.writeAnimSCC() diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/TemporaryParameterValuesTest.py b/cortex-9.0.0-a10/test/IECoreHoudini/TemporaryParameterValuesTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/TemporaryParameterValuesTest.py rename to cortex-9.0.0-a10/test/IECoreHoudini/TemporaryParameterValuesTest.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCompoundObjectConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCortexObjectConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCurvesConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCurvesConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniCurvesConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniCurvesConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniGroupConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniGroupConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniGroupConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniGroupConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniPointsConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniPointsConverter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniPointsConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniPointsConverter.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniPolygonsConverter.py b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniPolygonsConverter.py similarity index 95% rename from cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniPolygonsConverter.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniPolygonsConverter.py index 9cb0f77668..da6cf2e681 100644 --- a/cortex-9.0.0-a6/test/IECoreHoudini/ToHoudiniPolygonsConverter.py +++ b/cortex-9.0.0-a10/test/IECoreHoudini/ToHoudiniPolygonsConverter.py @@ -915,6 +915,61 @@ def testStandardAttributeConversion( self ) : self.assertAlmostEqual( vert.attribValue( t ), tData[i] ) i += 1 + def testCannotTransformRest( self ) : + + sop = self.emptySop() + mergeGeo = hou.node( "/obj" ).createNode( "geo", run_init_scripts=False ) + mergeGeo.parm( "tx" ).set( 10 ) + merge = mergeGeo.createNode( "object_merge" ) + merge.parm( "xformtype" ).set( 1 ) + merge.parm( "objpath1" ).set( sop.path() ) + + mesh = IECore.MeshPrimitive.createPlane( IECore.Box2f( IECore.V2f( 0 ), IECore.V2f( 1 ) ) ) + IECore.TriangulateOp()( input=mesh, copyInput=False ) + IECore.MeshNormalsOp()( input=mesh, copyInput=False ) + mesh["Pref"] = mesh["P"] + prefData = mesh["Pref"].data + self.assertTrue( mesh.arePrimitiveVariablesValid() ) + + converter = IECoreHoudini.ToHoudiniPolygonsConverter( mesh ) + self.assertTrue( converter.convert( sop ) ) + geo = sop.geometry() + geo2 = merge.geometry() + + i = 0 + for point in geo.points() : + restValue = point.attribValue( "rest" ) + self.assertAlmostEqual( IECore.V3f( restValue[0], restValue[1], restValue[2] ), prefData[i] ) + self.assertTrue( point.position().isAlmostEqual( hou.Vector3(restValue) ) ) + i += 1 + + i = 0 + for point in geo2.points() : + restValue = point.attribValue( "rest" ) + self.assertAlmostEqual( IECore.V3f( restValue[0], restValue[1], restValue[2] ), prefData[i] ) + self.assertFalse( point.position().isAlmostEqual( hou.Vector3(restValue) ) ) + i += 1 + + # Pref shouldn't transform either + converter["convertStandardAttributes"].setTypedValue( False ) + self.assertTrue( converter.convert( sop ) ) + geo = sop.geometry() + geo2 = merge.geometry() + + i = 0 + for point in geo.points() : + restValue = point.attribValue( "Pref" ) + self.assertAlmostEqual( IECore.V3f( restValue[0], restValue[1], restValue[2] ), prefData[i] ) + self.assertTrue( point.position().isAlmostEqual( hou.Vector3(restValue) ) ) + i += 1 + + i = 0 + for point in geo2.points() : + restValue = point.attribValue( "Pref" ) + self.assertAlmostEqual( IECore.V3f( restValue[0], restValue[1], restValue[2] ), prefData[i] ) + self.assertFalse( point.position().isAlmostEqual( hou.Vector3(restValue) ) ) + i += 1 + def testInterpolation( self ) : mesh = self.mesh() diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/UpdateMode.py b/cortex-9.0.0-a10/test/IECoreHoudini/UpdateMode.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/UpdateMode.py rename to cortex-9.0.0-a10/test/IECoreHoudini/UpdateMode.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/otls/testHDAs.otl b/cortex-9.0.0-a10/test/IECoreHoudini/data/otls/testHDAs.otl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/otls/testHDAs.otl rename to cortex-9.0.0-a10/test/IECoreHoudini/data/otls/testHDAs.otl diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planes.tif b/cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planes.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planes.tif rename to cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planes.tif diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesDCM.rat b/cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesDCM.rat similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesDCM.rat rename to cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesDCM.rat diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesMonoDSM.rat b/cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesMonoDSM.rat similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesMonoDSM.rat rename to cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesMonoDSM.rat diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesTripleDSM.rat b/cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesTripleDSM.rat similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/rat/planesTripleDSM.rat rename to cortex-9.0.0-a10/test/IECoreHoudini/data/rat/planesTripleDSM.rat diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torus.cob b/cortex-9.0.0-a10/test/IECoreHoudini/data/torus.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torus.cob rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torus.cob diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0250.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0250.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0250.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0250.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0300.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0300.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0300.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0300.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0450.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0450.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0450.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0450.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0500.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0500.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0500.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0500.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0750.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0750.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.0750.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.0750.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.1000.fio b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.1000.fio similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusVertCache.1000.fio rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusVertCache.1000.fio diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torusWithVertexNormals.bgeo b/cortex-9.0.0-a10/test/IECoreHoudini/data/torusWithVertexNormals.bgeo similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torusWithVertexNormals.bgeo rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torusWithVertexNormals.bgeo diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/data/torus_with_normals.cob b/cortex-9.0.0-a10/test/IECoreHoudini/data/torus_with_normals.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/data/torus_with_normals.cob rename to cortex-9.0.0-a10/test/IECoreHoudini/data/torus_with_normals.cob diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/cobReader/cobReader-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/cobReader/cobReader-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/cobReader/cobReader-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/cobReader/cobReader-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/meshMerge/meshMerge-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/meshNormalsOp/meshNormalsOp-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/multiTypeObject/multiTypeObject-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/noiseDeformer/noiseDeformer-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/objectDebug/objectDebug-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/objectDebug/objectDebug-2.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/compoundParameters/compoundParameters-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/groupParam/groupParam-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/groupParam/groupParam-2.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/pointParam/pointParam-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/polyParam/polyParam-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/parameters/primitives/primParam/primParam-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/swapAttribute/swapAttribute-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/vectors/V3fVectorAdder/V3fVectorAdder-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/ops/vectors/V3fVectorCreator/V3fVectorCreator-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/deformationBlur/deformationBlur-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/meshRender/meshRender-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/nestedChild/nestedChild-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/nestedParent/nestedParent-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/parameterTypes/parameterTypes-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/pointRender/pointRender-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveParameters/meshRender/meshRender-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveParameters/multiple/multiple-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/primitiveVariables/primitiveVariables-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/renderMode/renderMode-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/simpleGeometry/simpleGeometry-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-2.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/sphereProcedural/sphereProcedural-3.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/subdRender/subdRender-1.py diff --git a/cortex-9.0.0-a6/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py b/cortex-9.0.0-a10/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py rename to cortex-9.0.0-a10/test/IECoreHoudini/procedurals/transformationBlur/transformationBlur-1.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/All.py b/cortex-9.0.0-a10/test/IECoreMaya/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/All.py rename to cortex-9.0.0-a10/test/IECoreMaya/All.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/CallbackIdTest.py b/cortex-9.0.0-a10/test/IECoreMaya/CallbackIdTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/CallbackIdTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/CallbackIdTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ConverterHolder.py b/cortex-9.0.0-a10/test/IECoreMaya/ConverterHolder.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ConverterHolder.py rename to cortex-9.0.0-a10/test/IECoreMaya/ConverterHolder.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/DAGPathParametersTest.py b/cortex-9.0.0-a10/test/IECoreMaya/DAGPathParametersTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/DAGPathParametersTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/DAGPathParametersTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FnParameterisedHolderTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FnParameterisedHolderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FnParameterisedHolderTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FnParameterisedHolderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FnProceduralHolderTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FnProceduralHolderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FnProceduralHolderTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FnProceduralHolderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FnSceneShapeTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FnSceneShapeTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FnSceneShapeTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FnSceneShapeTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaCameraConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaCameraConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaCameraConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaCameraConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaCurveConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaCurveConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaCurveConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaCurveConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaGroupConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaGroupConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaGroupConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaGroupConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaLocatorConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaLocatorConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaLocatorConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaLocatorConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaMeshConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaMeshConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaMeshConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaMeshConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaObjectConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaObjectConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaObjectConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaObjectConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaParticleConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaParticleConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaParticleConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaParticleConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaPlugConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaPlugConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaPlugConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaPlugConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaProceduralHolderConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaSkinClusterConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaSkinClusterConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaSkinClusterConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaSkinClusterConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaTransformConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaTransformConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaTransformConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaTransformConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/FromMayaUnitPlugConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/FromMayaUnitPlugConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/FromMayaUnitPlugConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/FromMayaUnitPlugConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/GeometryCombinerTest.py b/cortex-9.0.0-a10/test/IECoreMaya/GeometryCombinerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/GeometryCombinerTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/GeometryCombinerTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ImageConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ImageConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ImageConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ImageConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/LiveSceneTest.py b/cortex-9.0.0-a10/test/IECoreMaya/LiveSceneTest.py similarity index 99% rename from cortex-9.0.0-a6/test/IECoreMaya/LiveSceneTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/LiveSceneTest.py index 58b6ac6f54..b8d0c5d258 100644 --- a/cortex-9.0.0-a6/test/IECoreMaya/LiveSceneTest.py +++ b/cortex-9.0.0-a10/test/IECoreMaya/LiveSceneTest.py @@ -719,13 +719,13 @@ def readMyAttribute( node, attr ) : transformScene = scene.child(str(t)) sphereScene = scene.child('pSphere') self.assertEqual( scene.attributeNames(), [ "scene:visible", "root" ] ) - self.assertEqual( scene.readAttribute("anyAttr", 0.0), None ) + self.assertEqual( scene.readAttribute("anyAttr", 0.0), IECore.NullObject.defaultNullObject() ) self.assertEqual( scene.readAttribute("scene:visible", 0.0), IECore.BoolData(True) ) self.assertEqual( scene.readAttribute("root", 0.0), IECore.BoolData(True) ) self.assertEqual( transformScene.attributeNames(), [ IECore.InternedString("scene:visible"), IECore.InternedString("transformAttribute") ] ) self.assertEqual( transformScene.hasAttribute("shapeAttribute"), False ) - self.assertEqual( transformScene.readAttribute("shapeAttribute", 0.0), None ) + self.assertEqual( transformScene.readAttribute("shapeAttribute", 0.0), IECore.NullObject.defaultNullObject() ) self.assertEqual( transformScene.readAttribute( "transformAttribute", 0.0), IECore.FloatData(5) ) self.assertEqual( sphereScene.attributeNames(), [ IECore.InternedString("scene:visible"), IECore.InternedString('shapeAttribute') ] ) self.assertEqual( sphereScene.readAttribute( "shapeAttribute", 0.0), IECore.StringData("mesh") ) diff --git a/cortex-9.0.0-a6/test/IECoreMaya/MayaTypeIdTest.py b/cortex-9.0.0-a10/test/IECoreMaya/MayaTypeIdTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/MayaTypeIdTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/MayaTypeIdTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/NamespacePollution.py b/cortex-9.0.0-a10/test/IECoreMaya/NamespacePollution.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/NamespacePollution.py rename to cortex-9.0.0-a10/test/IECoreMaya/NamespacePollution.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ObjectDataTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ObjectDataTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ObjectDataTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ObjectDataTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ParameterisedHolder.py b/cortex-9.0.0-a10/test/IECoreMaya/ParameterisedHolder.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ParameterisedHolder.py rename to cortex-9.0.0-a10/test/IECoreMaya/ParameterisedHolder.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/PlaybackFrameList.py b/cortex-9.0.0-a10/test/IECoreMaya/PlaybackFrameList.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/PlaybackFrameList.py rename to cortex-9.0.0-a10/test/IECoreMaya/PlaybackFrameList.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/PluginLoadUnload.py b/cortex-9.0.0-a10/test/IECoreMaya/PluginLoadUnload.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/PluginLoadUnload.py rename to cortex-9.0.0-a10/test/IECoreMaya/PluginLoadUnload.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/RunTimeTypedTest.py b/cortex-9.0.0-a10/test/IECoreMaya/RunTimeTypedTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/RunTimeTypedTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/RunTimeTypedTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/SceneShapeTest.py b/cortex-9.0.0-a10/test/IECoreMaya/SceneShapeTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/SceneShapeTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/SceneShapeTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/SplineParameterHandlerTest.py b/cortex-9.0.0-a10/test/IECoreMaya/SplineParameterHandlerTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/SplineParameterHandlerTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/SplineParameterHandlerTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/TemporaryAttributeValuesTest.py b/cortex-9.0.0-a10/test/IECoreMaya/TemporaryAttributeValuesTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/TemporaryAttributeValuesTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/TemporaryAttributeValuesTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaCameraConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaCameraConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaCameraConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaCameraConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaCurveConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaCurveConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaCurveConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaCurveConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaGroupConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaGroupConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaGroupConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaGroupConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaLocatorConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaLocatorConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaLocatorConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaLocatorConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaMeshConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaMeshConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaMeshConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaMeshConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaParticleConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaParticleConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaParticleConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaParticleConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaPlugConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaPlugConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaPlugConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaPlugConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/ToMayaSkinClusterConverterTest.py b/cortex-9.0.0-a10/test/IECoreMaya/ToMayaSkinClusterConverterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/ToMayaSkinClusterConverterTest.py rename to cortex-9.0.0-a10/test/IECoreMaya/ToMayaSkinClusterConverterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreMaya/scenes/colouredPlane.ma b/cortex-9.0.0-a10/test/IECoreMaya/scenes/colouredPlane.ma similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/scenes/colouredPlane.ma rename to cortex-9.0.0-a10/test/IECoreMaya/scenes/colouredPlane.ma diff --git a/cortex-9.0.0-a6/test/IECoreMaya/scenes/splineWithSparseEntries.ma b/cortex-9.0.0-a10/test/IECoreMaya/scenes/splineWithSparseEntries.ma similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/scenes/splineWithSparseEntries.ma rename to cortex-9.0.0-a10/test/IECoreMaya/scenes/splineWithSparseEntries.ma diff --git a/cortex-9.0.0-a6/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma b/cortex-9.0.0-a10/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma rename to cortex-9.0.0-a10/test/IECoreMaya/scenes/twoTrianglesWithSharedUVs.ma diff --git a/cortex-9.0.0-a6/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma b/cortex-9.0.0-a10/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma similarity index 100% rename from cortex-9.0.0-a6/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma rename to cortex-9.0.0-a10/test/IECoreMaya/scenes/twoTrianglesWithSplitUVs.ma diff --git a/cortex-9.0.0-a6/test/IECoreNuke/All.py b/cortex-9.0.0-a10/test/IECoreNuke/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/All.py rename to cortex-9.0.0-a10/test/IECoreNuke/All.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/DeepImageReaderTest.py b/cortex-9.0.0-a10/test/IECoreNuke/DeepImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/DeepImageReaderTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/DeepImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/FnAxisTest.py b/cortex-9.0.0-a10/test/IECoreNuke/FnAxisTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/FnAxisTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/FnAxisTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/KnobAccessorsTest.py b/cortex-9.0.0-a10/test/IECoreNuke/KnobAccessorsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/KnobAccessorsTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/KnobAccessorsTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/KnobConvertersTest.py b/cortex-9.0.0-a10/test/IECoreNuke/KnobConvertersTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/KnobConvertersTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/KnobConvertersTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/LensDistortTest.py b/cortex-9.0.0-a10/test/IECoreNuke/LensDistortTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/LensDistortTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/LensDistortTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/ObjectKnobTest.py b/cortex-9.0.0-a10/test/IECoreNuke/ObjectKnobTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/ObjectKnobTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/ObjectKnobTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/OpHolderTest.py b/cortex-9.0.0-a10/test/IECoreNuke/OpHolderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/OpHolderTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/OpHolderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/PNGReaderTest.py b/cortex-9.0.0-a10/test/IECoreNuke/PNGReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/PNGReaderTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/PNGReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/ParameterisedHolderTest.py b/cortex-9.0.0-a10/test/IECoreNuke/ParameterisedHolderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/ParameterisedHolderTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/ParameterisedHolderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/SceneCacheReaderTest.py b/cortex-9.0.0-a10/test/IECoreNuke/SceneCacheReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/SceneCacheReaderTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/SceneCacheReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/StringUtilTest.py b/cortex-9.0.0-a10/test/IECoreNuke/StringUtilTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/StringUtilTest.py rename to cortex-9.0.0-a10/test/IECoreNuke/StringUtilTest.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/ops/add/add-1.py b/cortex-9.0.0-a10/test/IECoreNuke/ops/add/add-1.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/ops/add/add-1.py rename to cortex-9.0.0-a10/test/IECoreNuke/ops/add/add-1.py diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/animatedSpheres.scc b/cortex-9.0.0-a10/test/IECoreNuke/scripts/animatedSpheres.scc similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/animatedSpheres.scc rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/animatedSpheres.scc diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0001.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0010.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0020.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0030.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0040.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0050.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0060.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0070.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResults.0080.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr b/cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/data/sceneCacheExpectedResultsB.0020.exr diff --git a/cortex-9.0.0-a6/test/IECoreNuke/scripts/sceneCacheTest.nk b/cortex-9.0.0-a10/test/IECoreNuke/scripts/sceneCacheTest.nk similarity index 100% rename from cortex-9.0.0-a6/test/IECoreNuke/scripts/sceneCacheTest.nk rename to cortex-9.0.0-a10/test/IECoreNuke/scripts/sceneCacheTest.nk diff --git a/cortex-9.0.0-a6/test/IECoreRI/All.py b/cortex-9.0.0-a10/test/IECoreRI/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/All.py rename to cortex-9.0.0-a10/test/IECoreRI/All.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/ArchiveRecord.py b/cortex-9.0.0-a10/test/IECoreRI/ArchiveRecord.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/ArchiveRecord.py rename to cortex-9.0.0-a10/test/IECoreRI/ArchiveRecord.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/ArrayPrimVarTest.py b/cortex-9.0.0-a10/test/IECoreRI/ArrayPrimVarTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/ArrayPrimVarTest.py rename to cortex-9.0.0-a10/test/IECoreRI/ArrayPrimVarTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/Camera.py b/cortex-9.0.0-a10/test/IECoreRI/Camera.py similarity index 95% rename from cortex-9.0.0-a6/test/IECoreRI/Camera.py rename to cortex-9.0.0-a10/test/IECoreRI/Camera.py index ed6ba2af03..bbaaf3136d 100644 --- a/cortex-9.0.0-a6/test/IECoreRI/Camera.py +++ b/cortex-9.0.0-a10/test/IECoreRI/Camera.py @@ -240,6 +240,24 @@ def testMotionBlurCameraRib( self ) : l = "".join( file( "test/IECoreRI/output/testCamera.rib" ).readlines() ) self.assert_( "MotionBegin [ 0 1 ]" in l ) - + + def testPixelAspectRatio( self ) : + + r = IECoreRI.Renderer( "test/IECoreRI/output/testCamera.rib" ) + + r.camera( "main", { + "resolution" : IECore.V2i( 100, 200 ), + "pixelAspectRatio" : 2.0, + } ) + + with IECore.WorldBlock( r ) : + pass + + l = "".join( file( "test/IECoreRI/output/testCamera.rib" ).readlines() ) + l = " ".join( l.split() ) + + self.assertTrue( "Format 100 200 2" in l ) + self.assertTrue( "ScreenWindow -1 1 -1 1" in l ) + if __name__ == "__main__": unittest.main() diff --git a/cortex-9.0.0-a6/test/IECoreRI/CoordinateSystemTest.py b/cortex-9.0.0-a10/test/IECoreRI/CoordinateSystemTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/CoordinateSystemTest.py rename to cortex-9.0.0-a10/test/IECoreRI/CoordinateSystemTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/CoshaderTest.py b/cortex-9.0.0-a10/test/IECoreRI/CoshaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/CoshaderTest.py rename to cortex-9.0.0-a10/test/IECoreRI/CoshaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/CurvesTest.py b/cortex-9.0.0-a10/test/IECoreRI/CurvesTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/CurvesTest.py rename to cortex-9.0.0-a10/test/IECoreRI/CurvesTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/DTEXDeepImageReaderTest.py b/cortex-9.0.0-a10/test/IECoreRI/DTEXDeepImageReaderTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/DTEXDeepImageReaderTest.py rename to cortex-9.0.0-a10/test/IECoreRI/DTEXDeepImageReaderTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/DTEXDeepImageWriterTest.py b/cortex-9.0.0-a10/test/IECoreRI/DTEXDeepImageWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/DTEXDeepImageWriterTest.py rename to cortex-9.0.0-a10/test/IECoreRI/DTEXDeepImageWriterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/DetailTest.py b/cortex-9.0.0-a10/test/IECoreRI/DetailTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/DetailTest.py rename to cortex-9.0.0-a10/test/IECoreRI/DetailTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/DoubleSided.py b/cortex-9.0.0-a10/test/IECoreRI/DoubleSided.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/DoubleSided.py rename to cortex-9.0.0-a10/test/IECoreRI/DoubleSided.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/DspyTest.py b/cortex-9.0.0-a10/test/IECoreRI/DspyTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/DspyTest.py rename to cortex-9.0.0-a10/test/IECoreRI/DspyTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/GXEvaluatorTest.py b/cortex-9.0.0-a10/test/IECoreRI/GXEvaluatorTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/GXEvaluatorTest.py rename to cortex-9.0.0-a10/test/IECoreRI/GXEvaluatorTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/GroupTest.py b/cortex-9.0.0-a10/test/IECoreRI/GroupTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/GroupTest.py rename to cortex-9.0.0-a10/test/IECoreRI/GroupTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/IlluminateTest.py b/cortex-9.0.0-a10/test/IECoreRI/IlluminateTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/IlluminateTest.py rename to cortex-9.0.0-a10/test/IECoreRI/IlluminateTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/Instancing.py b/cortex-9.0.0-a10/test/IECoreRI/Instancing.py similarity index 96% rename from cortex-9.0.0-a6/test/IECoreRI/Instancing.py rename to cortex-9.0.0-a10/test/IECoreRI/Instancing.py index fc01a5f545..60173d7608 100644 --- a/cortex-9.0.0-a6/test/IECoreRI/Instancing.py +++ b/cortex-9.0.0-a10/test/IECoreRI/Instancing.py @@ -129,7 +129,9 @@ def hash( self ) : # test writing a rib r = IECoreRI.Renderer( "test/IECoreRI/output/instancing.rib" ) - with WorldBlock( r ) : + with WorldBlock( r ) : + # disable auto instancing, as we're testing explicit instancing: + r.setAttribute("ri:automaticInstancing", BoolData(False)) r.procedural( InstanceInheritingProcedural() ) rib = "".join( open( "test/IECoreRI/output/instancing.rib" ).readlines() ) @@ -146,7 +148,9 @@ def hash( self ) : } ) - with WorldBlock( r ) : + with WorldBlock( r ) : + # disable auto instancing, as we're testing explicit instancing: + r.setAttribute("ri:automaticInstancing", BoolData(False)) r.concatTransform( M44f.createTranslated( V3f( 0, 0, -10 ) ) ) r.procedural( InstanceInheritingProcedural() ) @@ -188,6 +192,8 @@ def hash( self ) : with WorldBlock( r ) : + # disable auto instancing, as we're testing explicit instancing: + r.setAttribute("ri:automaticInstancing", BoolData(False)) r.concatTransform( M44f.createTranslated( V3f( 0, 0, -20 ) ) ) for i in range( 0, 100 ) : @@ -336,6 +342,9 @@ def testAutomaticInstancing( self ) : r = IECoreRI.Renderer( "test/IECoreRI/output/instancing.rib" ) with WorldBlock( r ) : + # check auto instancing is on by default, and turn it off: + self.assertEqual( r.getAttribute("ri:automaticInstancing"), BoolData(True)) + r.setAttribute("ri:automaticInstancing", BoolData(False)) m.render( r ) m.render( r ) diff --git a/cortex-9.0.0-a6/test/IECoreRI/MotionTest.py b/cortex-9.0.0-a10/test/IECoreRI/MotionTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/MotionTest.py rename to cortex-9.0.0-a10/test/IECoreRI/MotionTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/MultipleContextsTest.py b/cortex-9.0.0-a10/test/IECoreRI/MultipleContextsTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/MultipleContextsTest.py rename to cortex-9.0.0-a10/test/IECoreRI/MultipleContextsTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/Orientation.py b/cortex-9.0.0-a10/test/IECoreRI/Orientation.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/Orientation.py rename to cortex-9.0.0-a10/test/IECoreRI/Orientation.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/PTCParticleReader.py b/cortex-9.0.0-a10/test/IECoreRI/PTCParticleReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/PTCParticleReader.py rename to cortex-9.0.0-a10/test/IECoreRI/PTCParticleReader.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/PTCParticleWriter.py b/cortex-9.0.0-a10/test/IECoreRI/PTCParticleWriter.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/PTCParticleWriter.py rename to cortex-9.0.0-a10/test/IECoreRI/PTCParticleWriter.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/ParameterisedProcedural.py b/cortex-9.0.0-a10/test/IECoreRI/ParameterisedProcedural.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/ParameterisedProcedural.py rename to cortex-9.0.0-a10/test/IECoreRI/ParameterisedProcedural.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/PatchMeshTest.py b/cortex-9.0.0-a10/test/IECoreRI/PatchMeshTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/PatchMeshTest.py rename to cortex-9.0.0-a10/test/IECoreRI/PatchMeshTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/ProceduralThreadingTest.py b/cortex-9.0.0-a10/test/IECoreRI/ProceduralThreadingTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/ProceduralThreadingTest.py rename to cortex-9.0.0-a10/test/IECoreRI/ProceduralThreadingTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/PythonProceduralTest.py b/cortex-9.0.0-a10/test/IECoreRI/PythonProceduralTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/PythonProceduralTest.py rename to cortex-9.0.0-a10/test/IECoreRI/PythonProceduralTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/RIBWriterTest.py b/cortex-9.0.0-a10/test/IECoreRI/RIBWriterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/RIBWriterTest.py rename to cortex-9.0.0-a10/test/IECoreRI/RIBWriterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/Renderer.py b/cortex-9.0.0-a10/test/IECoreRI/Renderer.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/Renderer.py rename to cortex-9.0.0-a10/test/IECoreRI/Renderer.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/RerenderingTest.py b/cortex-9.0.0-a10/test/IECoreRI/RerenderingTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/RerenderingTest.py rename to cortex-9.0.0-a10/test/IECoreRI/RerenderingTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageReaderTest.py b/cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageReaderTest.py similarity index 94% rename from cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageReaderTest.py rename to cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageReaderTest.py index d8c95dede5..ef0b9e7d68 100644 --- a/cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageReaderTest.py +++ b/cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageReaderTest.py @@ -117,16 +117,16 @@ def testReadPixel( self ) : p = reader.readPixel( 100, 100 ) self.assertEqual( p.channelNames(), ( "A", ) ) self.assertEqual( p.numSamples(), 1 ) - self.assertAlmostEqual( p.getDepth( 0 ), 102.17636108, 6 ) + self.assertAlmostEqual( p.getDepth( 0 ), 102.18660736, 6 ) self.assertAlmostEqual( p[0][0], 1.0, 6 ) # hits one box then ground plane p2 = reader.readPixel( 256, 256 ) self.assertEqual( p2.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( p2.numSamples(), 3 ) - self.assertAlmostEqual( p2.getDepth( 0 ), 72.6087493, 6 ) - self.assertAlmostEqual( p2.getDepth( 1 ), 77.7387313, 6 ) - self.assertAlmostEqual( p2.getDepth( 2 ), 85.6622314, 6 ) + self.assertAlmostEqual( p2.getDepth( 0 ), 72.6086884, 6 ) + self.assertAlmostEqual( p2.getDepth( 1 ), 77.7386627, 6 ) + self.assertAlmostEqual( p2.getDepth( 2 ), 85.6621628, 6 ) expected = ( 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : @@ -136,11 +136,11 @@ def testReadPixel( self ) : p3 = reader.readPixel( 195, 225 ) self.assertEqual( p3.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( p3.numSamples(), 5 ) - self.assertAlmostEqual( p3.getDepth( 0 ), 68.6177368, 6 ) - self.assertAlmostEqual( p3.getDepth( 1 ), 75.3023605, 6 ) - self.assertAlmostEqual( p3.getDepth( 2 ), 77.4083328, 6 ) - self.assertAlmostEqual( p3.getDepth( 3 ), 80.0680771, 6 ) - self.assertAlmostEqual( p3.getDepth( 4 ), 88.8455811, 6 ) + self.assertAlmostEqual( p3.getDepth( 0 ), 68.6202545, 6 ) + self.assertAlmostEqual( p3.getDepth( 1 ), 75.3051300, 6 ) + self.assertAlmostEqual( p3.getDepth( 2 ), 77.4111862, 6 ) + self.assertAlmostEqual( p3.getDepth( 3 ), 80.0710297, 6 ) + self.assertAlmostEqual( p3.getDepth( 4 ), 88.8488693, 6 ) expected = ( 0.5, 0.75, 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : diff --git a/cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageWriterTest.py b/cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageWriterTest.py similarity index 94% rename from cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageWriterTest.py rename to cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageWriterTest.py index 5dfb1e552f..1d685b9c0b 100644 --- a/cortex-9.0.0-a6/test/IECoreRI/SHWDeepImageWriterTest.py +++ b/cortex-9.0.0-a10/test/IECoreRI/SHWDeepImageWriterTest.py @@ -157,16 +157,16 @@ def testReadWritePixel( self ) : p = reader.readPixel( 100, 100 ) self.assertEqual( p.channelNames(), ( "A", ) ) self.assertEqual( p.numSamples(), 1 ) - self.assertAlmostEqual( p.getDepth( 0 ), 102.17636108, 6 ) + self.assertAlmostEqual( p.getDepth( 0 ), 102.18660736, 6 ) self.assertAlmostEqual( p[0][0], 1.0, 6 ) # hits one box then ground plane p2 = reader.readPixel( 256, 256 ) self.assertEqual( p2.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( p2.numSamples(), 3 ) - self.assertAlmostEqual( p2.getDepth( 0 ), 72.6087493, 6 ) - self.assertAlmostEqual( p2.getDepth( 1 ), 77.7387313, 6 ) - self.assertAlmostEqual( p2.getDepth( 2 ), 85.6622314, 6 ) + self.assertAlmostEqual( p2.getDepth( 0 ), 72.6086884, 6 ) + self.assertAlmostEqual( p2.getDepth( 1 ), 77.7386627, 6 ) + self.assertAlmostEqual( p2.getDepth( 2 ), 85.6621628, 6 ) expected = ( 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : @@ -176,11 +176,11 @@ def testReadWritePixel( self ) : p3 = reader.readPixel( 195, 225 ) self.assertEqual( p3.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( p3.numSamples(), 5 ) - self.assertAlmostEqual( p3.getDepth( 0 ), 68.6177368, 6 ) - self.assertAlmostEqual( p3.getDepth( 1 ), 75.3023605, 6 ) - self.assertAlmostEqual( p3.getDepth( 2 ), 77.4083328, 6 ) - self.assertAlmostEqual( p3.getDepth( 3 ), 80.0680771, 6 ) - self.assertAlmostEqual( p3.getDepth( 4 ), 88.8455811, 6 ) + self.assertAlmostEqual( p3.getDepth( 0 ), 68.6202545, 6 ) + self.assertAlmostEqual( p3.getDepth( 1 ), 75.3051300, 6 ) + self.assertAlmostEqual( p3.getDepth( 2 ), 77.4111862, 6 ) + self.assertAlmostEqual( p3.getDepth( 3 ), 80.0710297, 6 ) + self.assertAlmostEqual( p3.getDepth( 4 ), 88.8488693, 6 ) expected = ( 0.5, 0.75, 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : @@ -201,16 +201,16 @@ def testReadWritePixel( self ) : rp = reader.readPixel( 0, 0 ) self.assertEqual( rp.channelNames(), ( "A", ) ) self.assertEqual( rp.numSamples(), 1 ) - self.assertAlmostEqual( rp.getDepth( 0 ), 102.17636108, 4 ) + self.assertAlmostEqual( rp.getDepth( 0 ), 102.18660736, 4 ) self.assertAlmostEqual( rp[0][0], 1.0, 6 ) # hits one box then ground plane rp2 = reader.readPixel( 0, 1 ) self.assertEqual( rp2.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( rp2.numSamples(), 3 ) - self.assertAlmostEqual( rp2.getDepth( 0 ), 72.6087493, 4 ) - self.assertAlmostEqual( rp2.getDepth( 1 ), 77.7387313, 4 ) - self.assertAlmostEqual( rp2.getDepth( 2 ), 85.6622314, 4 ) + self.assertAlmostEqual( rp2.getDepth( 0 ), 72.6086884, 4 ) + self.assertAlmostEqual( rp2.getDepth( 1 ), 77.7386627, 4 ) + self.assertAlmostEqual( rp2.getDepth( 2 ), 85.6621628, 4 ) expected = ( 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : @@ -220,11 +220,11 @@ def testReadWritePixel( self ) : rp3 = reader.readPixel( 1, 1 ) self.assertEqual( rp3.channelNames(), tuple(reader.channelNames()) ) self.assertEqual( rp3.numSamples(), 5 ) - self.assertAlmostEqual( rp3.getDepth( 0 ), 68.6177368, 6 ) - self.assertAlmostEqual( rp3.getDepth( 1 ), 75.3023605, 6 ) - self.assertAlmostEqual( rp3.getDepth( 2 ), 77.4083328, 6 ) - self.assertAlmostEqual( rp3.getDepth( 3 ), 80.0680771, 6 ) - self.assertAlmostEqual( rp3.getDepth( 4 ), 88.8455811, 6 ) + self.assertAlmostEqual( rp3.getDepth( 0 ), 68.6202545, 4 ) + self.assertAlmostEqual( rp3.getDepth( 1 ), 75.3051300, 4 ) + self.assertAlmostEqual( rp3.getDepth( 2 ), 77.4111862, 4 ) + self.assertAlmostEqual( rp3.getDepth( 3 ), 80.0710297, 4 ) + self.assertAlmostEqual( rp3.getDepth( 4 ), 88.8488693, 4 ) expected = ( 0.5, 0.75, 0.5, 0.5, 1.0 ) for i in range( 0, len(expected) ) : diff --git a/cortex-9.0.0-a6/test/IECoreRI/SLOReader.py b/cortex-9.0.0-a10/test/IECoreRI/SLOReader.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/SLOReader.py rename to cortex-9.0.0-a10/test/IECoreRI/SLOReader.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/SXRendererTest.py b/cortex-9.0.0-a10/test/IECoreRI/SXRendererTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/SXRendererTest.py rename to cortex-9.0.0-a10/test/IECoreRI/SXRendererTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/StringArrayParameterTest.py b/cortex-9.0.0-a10/test/IECoreRI/StringArrayParameterTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/StringArrayParameterTest.py rename to cortex-9.0.0-a10/test/IECoreRI/StringArrayParameterTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/SubsurfaceTest.py b/cortex-9.0.0-a10/test/IECoreRI/SubsurfaceTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/SubsurfaceTest.py rename to cortex-9.0.0-a10/test/IECoreRI/SubsurfaceTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/TextTest.py b/cortex-9.0.0-a10/test/IECoreRI/TextTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/TextTest.py rename to cortex-9.0.0-a10/test/IECoreRI/TextTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/TextureOrientationTest.py b/cortex-9.0.0-a10/test/IECoreRI/TextureOrientationTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/TextureOrientationTest.py rename to cortex-9.0.0-a10/test/IECoreRI/TextureOrientationTest.py diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/cube.ptc b/cortex-9.0.0-a10/test/IECoreRI/data/cube.ptc similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/cube.ptc rename to cortex-9.0.0-a10/test/IECoreRI/data/cube.ptc diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bSpline.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bSpline.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bSpline.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bSpline.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bSplinePeriodic.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bSplinePeriodic.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bSplinePeriodic.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bSplinePeriodic.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bezier.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bezier.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/bezier.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/bezier.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/linear.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/linear.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/linear.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/linear.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/linearPeriodic.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/linearPeriodic.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/linearPeriodic.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/linearPeriodic.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/curveImages/motionBlur.tif b/cortex-9.0.0-a10/test/IECoreRI/data/curveImages/motionBlur.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/curveImages/motionBlur.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/curveImages/motionBlur.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/dtex/coneAndSphere.dtex b/cortex-9.0.0-a10/test/IECoreRI/data/dtex/coneAndSphere.dtex similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/dtex/coneAndSphere.dtex rename to cortex-9.0.0-a10/test/IECoreRI/data/dtex/coneAndSphere.dtex diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/dtex/coneAndSphere.exr b/cortex-9.0.0-a10/test/IECoreRI/data/dtex/coneAndSphere.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/dtex/coneAndSphere.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/dtex/coneAndSphere.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr b/cortex-9.0.0-a10/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/exr/deepSmokeWithoutZBack.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/exr/primitives.exr b/cortex-9.0.0-a10/test/IECoreRI/data/exr/primitives.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/exr/primitives.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/exr/primitives.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/gxProblemMesh.cob b/cortex-9.0.0-a10/test/IECoreRI/data/gxProblemMesh.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/gxProblemMesh.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/gxProblemMesh.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/gxProblemSeeds.cob b/cortex-9.0.0-a10/test/IECoreRI/data/gxProblemSeeds.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/gxProblemSeeds.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/gxProblemSeeds.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/gxSubdivCube.cob b/cortex-9.0.0-a10/test/IECoreRI/data/gxSubdivCube.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/gxSubdivCube.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/gxSubdivCube.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/openSubDivCube.cob b/cortex-9.0.0-a10/test/IECoreRI/data/openSubDivCube.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/openSubDivCube.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/openSubDivCube.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bSpline.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bSpline.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bSpline.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bSpline.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bSplinePeriodic.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bezier.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bezier.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/bezier.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/bezier.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/linear.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/linear.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/linear.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/linear.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/linearPeriodic.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/motionBlur.tif b/cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/motionBlur.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/patchMeshImages/motionBlur.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/patchMeshImages/motionBlur.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/coneAndSphere.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/coneAndSphere.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/coneAndSphere.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/coneAndSphere.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlane.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlane.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlane.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlane.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlane2.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlane2.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlane2.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlane2.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlaneOrtho.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlaneOrtho.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/constantPlaneOrtho.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/constantPlaneOrtho.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/groundPlane.exr b/cortex-9.0.0-a10/test/IECoreRI/data/shw/groundPlane.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/groundPlane.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/groundPlane.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/primitives.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/primitives.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/primitives.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/primitives.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/shw/translucentBoxes.shw b/cortex-9.0.0-a10/test/IECoreRI/data/shw/translucentBoxes.shw similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/shw/translucentBoxes.shw rename to cortex-9.0.0-a10/test/IECoreRI/data/shw/translucentBoxes.shw diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sphere.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sphere.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sphere.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sphere.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/stringPrimVars.cob b/cortex-9.0.0-a10/test/IECoreRI/data/stringPrimVars.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/stringPrimVars.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/stringPrimVars.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowI.exr b/cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowI.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowI.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowI.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowN.exr b/cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowN.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowN.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowN.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowP.exr b/cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowP.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxInput/cowP.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/sxInput/cowP.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/coshaders.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/coshaders.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/coshaders.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/coshaders.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowCI.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowCI.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowCI.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowCI.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowColor.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowColor.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowColor.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowColor.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowFloat.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowFloat.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowFloat.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowFloat.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowOI.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowOI.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/cowOI.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/cowOI.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/grid.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/grid.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/grid.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/grid.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/noGrid.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/noGrid.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/noGrid.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/noGrid.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/shadePlaneCompoundData.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/shadePlaneImage.exr b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/shadePlaneImage.exr similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/shadePlaneImage.exr rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/shadePlaneImage.exr diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/spline.cob b/cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/spline.cob similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/sxOutput/spline.cob rename to cortex-9.0.0-a10/test/IECoreRI/data/sxOutput/spline.cob diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/test.3Dbake b/cortex-9.0.0-a10/test/IECoreRI/data/test.3Dbake similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/test.3Dbake rename to cortex-9.0.0-a10/test/IECoreRI/data/test.3Dbake diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/testProceduralThreading.tif b/cortex-9.0.0-a10/test/IECoreRI/data/testProceduralThreading.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/testProceduralThreading.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/testProceduralThreading.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/testPythonProcedural.tif b/cortex-9.0.0-a10/test/IECoreRI/data/testPythonProcedural.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/testPythonProcedural.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/testPythonProcedural.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/textImages/helloWorld.tif b/cortex-9.0.0-a10/test/IECoreRI/data/textImages/helloWorld.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/textImages/helloWorld.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/textImages/helloWorld.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/textureOrientationImages/expected.tif b/cortex-9.0.0-a10/test/IECoreRI/data/textureOrientationImages/expected.tif similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/textureOrientationImages/expected.tif rename to cortex-9.0.0-a10/test/IECoreRI/data/textureOrientationImages/expected.tif diff --git a/cortex-9.0.0-a6/test/IECoreRI/data/textures/uvMap.256x256.tdl b/cortex-9.0.0-a10/test/IECoreRI/data/textures/uvMap.256x256.tdl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/data/textures/uvMap.256x256.tdl rename to cortex-9.0.0-a10/test/IECoreRI/data/textures/uvMap.256x256.tdl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/coshaderTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/coshaderTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/coshaderTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/coshaderTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/splineTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/splineTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/splineTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/splineTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoordSystemTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoordSystemTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoordSystemTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoordSystemTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoshaderTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoshaderTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoshaderTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoshaderTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoshaderTestMain.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoshaderTestMain.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxCoshaderTestMain.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxCoshaderTestMain.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxDisplacementTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxDisplacementTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxDisplacementTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxDisplacementTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetShaderTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetShaderTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetShaderTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetShaderTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetShaderTestMain.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetShaderTestMain.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetShaderTestMain.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetShaderTestMain.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetVarTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetVarTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxGetVarTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxGetVarTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxGridTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxGridTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxGridTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxGridTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxIlluminanceTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxIlluminanceTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxIlluminanceTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxIlluminanceTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxLightTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxLightTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxLightTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxLightTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxNonPredefinedPrimitiveVariableTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxParameterTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxParameterTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxParameterTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxParameterTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxPredefinedPrimitiveVariableTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxStTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxStTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxStTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxStTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxStackTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxStackTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxStackTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxStackTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxStringArrayOptionTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxStringArrayOptionTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxStringArrayOptionTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxStringArrayOptionTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxTextureTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxTextureTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxTextureTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxTextureTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxUniformPrimitiveVariableShaderParameterTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxUniformPrimitiveVariableTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/sxUserOptionTest.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/sxUserOptionTest.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/sxUserOptionTest.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/sxUserOptionTest.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/tex.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/tex.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/tex.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/tex.sl diff --git a/cortex-9.0.0-a6/test/IECoreRI/shaders/types.sl b/cortex-9.0.0-a10/test/IECoreRI/shaders/types.sl similarity index 100% rename from cortex-9.0.0-a6/test/IECoreRI/shaders/types.sl rename to cortex-9.0.0-a10/test/IECoreRI/shaders/types.sl diff --git a/cortex-9.0.0-a6/test/IECoreTruelight/All.py b/cortex-9.0.0-a10/test/IECoreTruelight/All.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreTruelight/All.py rename to cortex-9.0.0-a10/test/IECoreTruelight/All.py diff --git a/cortex-9.0.0-a6/test/IECoreTruelight/TruelightColorTransformOpTest.py b/cortex-9.0.0-a10/test/IECoreTruelight/TruelightColorTransformOpTest.py similarity index 100% rename from cortex-9.0.0-a6/test/IECoreTruelight/TruelightColorTransformOpTest.py rename to cortex-9.0.0-a10/test/IECoreTruelight/TruelightColorTransformOpTest.py diff --git a/cortex-9.0.0-a6/test/IECoreTruelight/data/alphachannelFAIL.tiff b/cortex-9.0.0-a10/test/IECoreTruelight/data/alphachannelFAIL.tiff similarity index 100% rename from cortex-9.0.0-a6/test/IECoreTruelight/data/alphachannelFAIL.tiff rename to cortex-9.0.0-a10/test/IECoreTruelight/data/alphachannelFAIL.tiff