Updated to Cortex 9.0.0-a10

GafferHQ · Nov 24, 2014 · 1271d67 · 1271d67
1 parent a73da8d
commit 1271d67
Show file tree

Hide file tree

Showing 3,829 changed files with 1,239 additions and 270 deletions.
diff --git a/cortex-9.0.0-a6/.gitignore → cortex-9.0.0-a10/.gitignore b/cortex-9.0.0-a6/.gitignore → cortex-9.0.0-a10/.gitignore
diff --git a/cortex-9.0.0-a6/Changes → cortex-9.0.0-a10/Changes b/cortex-9.0.0-a6/Changes → 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 → cortex-9.0.0-a10/LICENSE b/cortex-9.0.0-a6/LICENSE → cortex-9.0.0-a10/LICENSE
diff --git a/cortex-9.0.0-a6/README.asciidoc → cortex-9.0.0-a10/README.asciidoc b/cortex-9.0.0-a6/README.asciidoc → cortex-9.0.0-a10/README.asciidoc
diff --git a/cortex-9.0.0-a6/SConstruct → cortex-9.0.0-a10/SConstruct b/cortex-9.0.0-a6/SConstruct → 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 → cortex-9.0.0-a10/config/ie/buildAll b/cortex-9.0.0-a6/config/ie/buildAll → cortex-9.0.0-a10/config/ie/buildAll
diff --git a/cortex-9.0.0-a6/config/ie/options → cortex-9.0.0-a10/config/ie/options b/cortex-9.0.0-a6/config/ie/options → cortex-9.0.0-a10/config/ie/options
diff --git a/...9.0.0-a6/config/ie/postCoreHoudiniInstall → ....0.0-a10/config/ie/postCoreHoudiniInstall b/...9.0.0-a6/config/ie/postCoreHoudiniInstall → ....0.0-a10/config/ie/postCoreHoudiniInstall
diff --git a/...ex-9.0.0-a6/config/ie/postCoreMayaInstall → ...x-9.0.0-a10/config/ie/postCoreMayaInstall b/...ex-9.0.0-a6/config/ie/postCoreMayaInstall → ...x-9.0.0-a10/config/ie/postCoreMayaInstall
diff --git a/...x-9.0.0-a6/config/ie/valgrindSuppressions → ...-9.0.0-a10/config/ie/valgrindSuppressions b/...x-9.0.0-a6/config/ie/valgrindSuppressions → ...-9.0.0-a10/config/ie/valgrindSuppressions
diff --git a/...mbic/include/IECoreAlembic/AlembicInput.h → ...mbic/include/IECoreAlembic/AlembicInput.h b/...mbic/include/IECoreAlembic/AlembicInput.h → ...mbic/include/IECoreAlembic/AlembicInput.h
diff --git a/...ECoreAlembic/FromAlembicCameraConverter.h → ...ECoreAlembic/FromAlembicCameraConverter.h b/...ECoreAlembic/FromAlembicCameraConverter.h → ...ECoreAlembic/FromAlembicCameraConverter.h
diff --git a/...lude/IECoreAlembic/FromAlembicConverter.h → ...lude/IECoreAlembic/FromAlembicConverter.h b/...lude/IECoreAlembic/FromAlembicConverter.h → ...lude/IECoreAlembic/FromAlembicConverter.h
diff --git a/...de/IECoreAlembic/FromAlembicConverter.inl → ...de/IECoreAlembic/FromAlembicConverter.inl b/...de/IECoreAlembic/FromAlembicConverter.inl → ...de/IECoreAlembic/FromAlembicConverter.inl
diff --git a/...oreAlembic/FromAlembicGeomBaseConverter.h → ...oreAlembic/FromAlembicGeomBaseConverter.h b/...oreAlembic/FromAlembicGeomBaseConverter.h → ...oreAlembic/FromAlembicGeomBaseConverter.h
diff --git a/...oreAlembic/FromAlembicPolyMeshConverter.h → ...oreAlembic/FromAlembicPolyMeshConverter.h b/...oreAlembic/FromAlembicPolyMeshConverter.h → ...oreAlembic/FromAlembicPolyMeshConverter.h
diff --git a/.../IECoreAlembic/FromAlembicSubDConverter.h → .../IECoreAlembic/FromAlembicSubDConverter.h b/.../IECoreAlembic/FromAlembicSubDConverter.h → .../IECoreAlembic/FromAlembicSubDConverter.h
diff --git a/...IECoreAlembic/FromAlembicXFormConverter.h → ...IECoreAlembic/FromAlembicXFormConverter.h b/...IECoreAlembic/FromAlembicXFormConverter.h → ...IECoreAlembic/FromAlembicXFormConverter.h
diff --git a/.../include/IECoreAlembic/IGeomParamTraits.h → .../include/IECoreAlembic/IGeomParamTraits.h b/.../include/IECoreAlembic/IGeomParamTraits.h → .../include/IECoreAlembic/IGeomParamTraits.h
diff --git a/...reAlembic/include/IECoreAlembic/TypeIds.h → ...reAlembic/include/IECoreAlembic/TypeIds.h b/...reAlembic/include/IECoreAlembic/TypeIds.h → ...reAlembic/include/IECoreAlembic/TypeIds.h
diff --git a/...oreAlembic/bindings/AlembicInputBinding.h → ...oreAlembic/bindings/AlembicInputBinding.h b/...oreAlembic/bindings/AlembicInputBinding.h → ...oreAlembic/bindings/AlembicInputBinding.h
diff --git a/...eAlembic/python/IECoreAlembic/ABCToMDC.py → ...eAlembic/python/IECoreAlembic/ABCToMDC.py b/...eAlembic/python/IECoreAlembic/ABCToMDC.py → ...eAlembic/python/IECoreAlembic/ABCToMDC.py
diff --git a/...python/IECoreAlembic/AlembicProcedural.py → ...python/IECoreAlembic/AlembicProcedural.py b/...python/IECoreAlembic/AlembicProcedural.py → ...python/IECoreAlembic/AlembicProcedural.py
diff --git a/...eAlembic/python/IECoreAlembic/__init__.py → ...eAlembic/python/IECoreAlembic/__init__.py b/...eAlembic/python/IECoreAlembic/__init__.py → ...eAlembic/python/IECoreAlembic/__init__.py
diff --git a/...lembic/src/IECoreAlembic/AlembicInput.cpp → ...lembic/src/IECoreAlembic/AlembicInput.cpp b/...lembic/src/IECoreAlembic/AlembicInput.cpp → ...lembic/src/IECoreAlembic/AlembicInput.cpp
diff --git a/...oreAlembic/FromAlembicCameraConverter.cpp → ...oreAlembic/FromAlembicCameraConverter.cpp b/...oreAlembic/FromAlembicCameraConverter.cpp → ...oreAlembic/FromAlembicCameraConverter.cpp
diff --git a/...rc/IECoreAlembic/FromAlembicConverter.cpp → ...rc/IECoreAlembic/FromAlembicConverter.cpp b/...rc/IECoreAlembic/FromAlembicConverter.cpp → ...rc/IECoreAlembic/FromAlembicConverter.cpp
diff --git a/...eAlembic/FromAlembicGeomBaseConverter.cpp → ...eAlembic/FromAlembicGeomBaseConverter.cpp b/...eAlembic/FromAlembicGeomBaseConverter.cpp → ...eAlembic/FromAlembicGeomBaseConverter.cpp
diff --git a/...eAlembic/FromAlembicPolyMeshConverter.cpp → ...eAlembic/FromAlembicPolyMeshConverter.cpp b/...eAlembic/FromAlembicPolyMeshConverter.cpp → ...eAlembic/FromAlembicPolyMeshConverter.cpp
diff --git a/...ECoreAlembic/FromAlembicSubDConverter.cpp → ...ECoreAlembic/FromAlembicSubDConverter.cpp b/...ECoreAlembic/FromAlembicSubDConverter.cpp → ...ECoreAlembic/FromAlembicSubDConverter.cpp
diff --git a/...CoreAlembic/FromAlembicXFormConverter.cpp → ...CoreAlembic/FromAlembicXFormConverter.cpp b/...CoreAlembic/FromAlembicXFormConverter.cpp → ...CoreAlembic/FromAlembicXFormConverter.cpp
diff --git a/...eAlembic/bindings/AlembicInputBinding.cpp → ...eAlembic/bindings/AlembicInputBinding.cpp b/...eAlembic/bindings/AlembicInputBinding.cpp → ...eAlembic/bindings/AlembicInputBinding.cpp
diff --git a/...Alembic/bindings/IECoreAlembicBinding.cpp → ...Alembic/bindings/IECoreAlembicBinding.cpp b/...Alembic/bindings/IECoreAlembicBinding.cpp → ...Alembic/bindings/IECoreAlembicBinding.cpp
diff --git a/...lembic/test/IECoreAlembic/ABCToMDCTest.py → ...lembic/test/IECoreAlembic/ABCToMDCTest.py b/...lembic/test/IECoreAlembic/ABCToMDCTest.py → ...lembic/test/IECoreAlembic/ABCToMDCTest.py
diff --git a/...ic/test/IECoreAlembic/AlembicInputTest.py → ...ic/test/IECoreAlembic/AlembicInputTest.py b/...ic/test/IECoreAlembic/AlembicInputTest.py → ...ic/test/IECoreAlembic/AlembicInputTest.py
diff --git a/...b/IECoreAlembic/test/IECoreAlembic/All.py → ...b/IECoreAlembic/test/IECoreAlembic/All.py b/...b/IECoreAlembic/test/IECoreAlembic/All.py → ...b/IECoreAlembic/test/IECoreAlembic/All.py
diff --git a/.../test/IECoreAlembic/data/animatedCube.abc → .../test/IECoreAlembic/data/animatedCube.abc b/.../test/IECoreAlembic/data/animatedCube.abc → .../test/IECoreAlembic/data/animatedCube.abc
diff --git a/...c/test/IECoreAlembic/data/coloredMesh.abc → ...c/test/IECoreAlembic/data/coloredMesh.abc b/...c/test/IECoreAlembic/data/coloredMesh.abc → ...c/test/IECoreAlembic/data/coloredMesh.abc
diff --git a/...eAlembic/test/IECoreAlembic/data/cube.abc → ...eAlembic/test/IECoreAlembic/data/cube.abc b/...eAlembic/test/IECoreAlembic/data/cube.abc → ...eAlembic/test/IECoreAlembic/data/cube.abc
diff --git a/...reAlembic/data/noTopLevelStoredBounds.abc → ...reAlembic/data/noTopLevelStoredBounds.abc b/...reAlembic/data/noTopLevelStoredBounds.abc → ...reAlembic/data/noTopLevelStoredBounds.abc
diff --git a/.../test/IECoreAlembic/data/rotatingCube.abc → .../test/IECoreAlembic/data/rotatingCube.abc b/.../test/IECoreAlembic/data/rotatingCube.abc → .../test/IECoreAlembic/data/rotatingCube.abc
diff --git a/...bic/test/IECoreAlembic/data/subdPlane.abc → ...bic/test/IECoreAlembic/data/subdPlane.abc b/...bic/test/IECoreAlembic/data/subdPlane.abc → ...bic/test/IECoreAlembic/data/subdPlane.abc
diff --git a/...nclude/IECoreArnold/InstancingConverter.h → ...nclude/IECoreArnold/InstancingConverter.h b/...nclude/IECoreArnold/InstancingConverter.h → ...nclude/IECoreArnold/InstancingConverter.h
diff --git a/...oreArnold/include/IECoreArnold/Renderer.h → ...oreArnold/include/IECoreArnold/Renderer.h b/...oreArnold/include/IECoreArnold/Renderer.h → ...oreArnold/include/IECoreArnold/Renderer.h
diff --git a/...de/IECoreArnold/ToArnoldCameraConverter.h → ...de/IECoreArnold/ToArnoldCameraConverter.h b/...de/IECoreArnold/ToArnoldCameraConverter.h → ...de/IECoreArnold/ToArnoldCameraConverter.h
diff --git a/.../include/IECoreArnold/ToArnoldConverter.h → .../include/IECoreArnold/ToArnoldConverter.h b/.../include/IECoreArnold/ToArnoldConverter.h → .../include/IECoreArnold/ToArnoldConverter.h
diff --git a/...nclude/IECoreArnold/ToArnoldConverter.inl → ...nclude/IECoreArnold/ToArnoldConverter.inl b/...nclude/IECoreArnold/ToArnoldConverter.inl → ...nclude/IECoreArnold/ToArnoldConverter.inl
diff --git a/...de/IECoreArnold/ToArnoldCurvesConverter.h → ...de/IECoreArnold/ToArnoldCurvesConverter.h b/...de/IECoreArnold/ToArnoldCurvesConverter.h → ...de/IECoreArnold/ToArnoldCurvesConverter.h
diff --git a/...lude/IECoreArnold/ToArnoldMeshConverter.h → ...lude/IECoreArnold/ToArnoldMeshConverter.h b/...lude/IECoreArnold/ToArnoldMeshConverter.h → ...lude/IECoreArnold/ToArnoldMeshConverter.h
diff --git a/...de/IECoreArnold/ToArnoldPointsConverter.h → ...de/IECoreArnold/ToArnoldPointsConverter.h b/...de/IECoreArnold/ToArnoldPointsConverter.h → ...de/IECoreArnold/ToArnoldPointsConverter.h
diff --git a/...ude/IECoreArnold/ToArnoldShapeConverter.h → ...ude/IECoreArnold/ToArnoldShapeConverter.h b/...ude/IECoreArnold/ToArnoldShapeConverter.h → ...ude/IECoreArnold/ToArnoldShapeConverter.h
diff --git a/...CoreArnold/include/IECoreArnold/TypeIds.h → ...CoreArnold/include/IECoreArnold/TypeIds.h b/...CoreArnold/include/IECoreArnold/TypeIds.h → ...CoreArnold/include/IECoreArnold/TypeIds.h
diff --git a/...nold/include/IECoreArnold/UniverseBlock.h → ...nold/include/IECoreArnold/UniverseBlock.h b/...nold/include/IECoreArnold/UniverseBlock.h → ...nold/include/IECoreArnold/UniverseBlock.h
diff --git a/...old/bindings/InstancingConverterBinding.h → ...old/bindings/InstancingConverterBinding.h b/...old/bindings/InstancingConverterBinding.h → ...old/bindings/InstancingConverterBinding.h
diff --git a/...e/IECoreArnold/bindings/RendererBinding.h → ...e/IECoreArnold/bindings/RendererBinding.h b/...e/IECoreArnold/bindings/RendererBinding.h → ...e/IECoreArnold/bindings/RendererBinding.h
diff --git a/...rnold/bindings/ToArnoldConverterBinding.h → ...rnold/bindings/ToArnoldConverterBinding.h b/...rnold/bindings/ToArnoldConverterBinding.h → ...rnold/bindings/ToArnoldConverterBinding.h
diff --git a/...bindings/ToArnoldCurvesConverterBinding.h → ...bindings/ToArnoldCurvesConverterBinding.h b/...bindings/ToArnoldCurvesConverterBinding.h → ...bindings/ToArnoldCurvesConverterBinding.h
diff --git a/...d/bindings/ToArnoldMeshConverterBinding.h → ...d/bindings/ToArnoldMeshConverterBinding.h b/...d/bindings/ToArnoldMeshConverterBinding.h → ...d/bindings/ToArnoldMeshConverterBinding.h
diff --git a/...bindings/ToArnoldPointsConverterBinding.h → ...bindings/ToArnoldPointsConverterBinding.h b/...bindings/ToArnoldPointsConverterBinding.h → ...bindings/ToArnoldPointsConverterBinding.h
diff --git a/.../bindings/ToArnoldShapeConverterBinding.h → .../bindings/ToArnoldShapeConverterBinding.h b/.../bindings/ToArnoldShapeConverterBinding.h → .../bindings/ToArnoldShapeConverterBinding.h
diff --git a/...oreArnold/bindings/UniverseBlockBinding.h → ...oreArnold/bindings/UniverseBlockBinding.h b/...oreArnold/bindings/UniverseBlockBinding.h → ...oreArnold/bindings/UniverseBlockBinding.h
diff --git a/...reArnold/private/RendererImplementation.h → ...reArnold/private/RendererImplementation.h b/...reArnold/private/RendererImplementation.h → ...reArnold/private/RendererImplementation.h
diff --git a/...nold/python/IECoreArnold/UniverseBlock.py → ...nold/python/IECoreArnold/UniverseBlock.py b/...nold/python/IECoreArnold/UniverseBlock.py → ...nold/python/IECoreArnold/UniverseBlock.py
diff --git a/...oreArnold/python/IECoreArnold/__init__.py → ...oreArnold/python/IECoreArnold/__init__.py b/...oreArnold/python/IECoreArnold/__init__.py → ...oreArnold/python/IECoreArnold/__init__.py
diff --git a/.../src/IECoreArnold/InstancingConverter.cpp → .../src/IECoreArnold/InstancingConverter.cpp b/.../src/IECoreArnold/InstancingConverter.cpp → .../src/IECoreArnold/InstancingConverter.cpp
diff --git a/...ECoreArnold/src/IECoreArnold/Renderer.cpp → ...ECoreArnold/src/IECoreArnold/Renderer.cpp b/...ECoreArnold/src/IECoreArnold/Renderer.cpp → ...ECoreArnold/src/IECoreArnold/Renderer.cpp
diff --git a/...c/IECoreArnold/RendererImplementation.cpp → ...c/IECoreArnold/RendererImplementation.cpp b/...c/IECoreArnold/RendererImplementation.cpp → ...c/IECoreArnold/RendererImplementation.cpp
@@ -208,16 +208,21 @@ IECore::ConstDataPtr IECoreArnold::RendererImplementation::getOption( const std:
 void IECoreArnold::RendererImplementation::camera( const std::string &name, const IECore::CompoundDataMap &parameters )
 {
 	CameraPtr cortexCamera = new Camera( name, 0, new CompoundData( parameters ) );
+	cortexCamera->addStandardParameters();
+
 	ToArnoldCameraConverterPtr converter = new ToArnoldCameraConverter( cortexCamera );
 	AtNode *arnoldCamera = converter->convert();
 	AtNode *options = AiUniverseGetOptions();
 	AiNodeSetPtr( options, "camera", arnoldCamera );
 
 	applyTransformToNode( arnoldCamera );
 
-	ConstV2iDataPtr resolution = cortexCamera->parametersData()->member<V2iData>( "resolution" );
-	AiNodeSetInt( options, "xres", resolution ? resolution->readable().x : 640 );
-	AiNodeSetInt( options, "yres", resolution ? resolution->readable().y : 480 );
+	const V2iData *resolution = cortexCamera->parametersData()->member<V2iData>( "resolution" );
+	AiNodeSetInt( options, "xres", resolution->readable().x );
+	AiNodeSetInt( options, "yres", resolution->readable().y );
+
+	const FloatData *pixelAspectRatio = cortexCamera->parametersData()->member<FloatData>( "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 &parameters )

diff --git a/.../IECoreArnold/ToArnoldCameraConverter.cpp → .../IECoreArnold/ToArnoldCameraConverter.cpp b/.../IECoreArnold/ToArnoldCameraConverter.cpp → .../IECoreArnold/ToArnoldCameraConverter.cpp
@@ -94,7 +94,8 @@ AtNode *ToArnoldCameraConverter::doConversion( IECore::ConstObjectPtr from, IECo
 	// set screen window
 	const Imath::Box2f &screenWindow = camera->parametersData()->member<Box2fData>( "screenWindow", true )->readable();
 	const Imath::V2i &resolution = camera->parametersData()->member<V2iData>( "resolution", true )->readable();
-	float aspect = (float)resolution.x / (float)resolution.y;
+	const float pixelAspectRatio = camera->parametersData()->member<FloatData>( "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/...ld/src/IECoreArnold/ToArnoldConverter.cpp → ...ld/src/IECoreArnold/ToArnoldConverter.cpp b/...ld/src/IECoreArnold/ToArnoldConverter.cpp → ...ld/src/IECoreArnold/ToArnoldConverter.cpp
diff --git a/.../IECoreArnold/ToArnoldCurvesConverter.cpp → .../IECoreArnold/ToArnoldCurvesConverter.cpp b/.../IECoreArnold/ToArnoldCurvesConverter.cpp → .../IECoreArnold/ToArnoldCurvesConverter.cpp
diff --git a/...rc/IECoreArnold/ToArnoldMeshConverter.cpp → ...rc/IECoreArnold/ToArnoldMeshConverter.cpp b/...rc/IECoreArnold/ToArnoldMeshConverter.cpp → ...rc/IECoreArnold/ToArnoldMeshConverter.cpp
diff --git a/.../IECoreArnold/ToArnoldPointsConverter.cpp → .../IECoreArnold/ToArnoldPointsConverter.cpp b/.../IECoreArnold/ToArnoldPointsConverter.cpp → .../IECoreArnold/ToArnoldPointsConverter.cpp
diff --git a/...c/IECoreArnold/ToArnoldShapeConverter.cpp → ...c/IECoreArnold/ToArnoldShapeConverter.cpp b/...c/IECoreArnold/ToArnoldShapeConverter.cpp → ...c/IECoreArnold/ToArnoldShapeConverter.cpp
diff --git a/...Arnold/src/IECoreArnold/UniverseBlock.cpp → ...Arnold/src/IECoreArnold/UniverseBlock.cpp b/...Arnold/src/IECoreArnold/UniverseBlock.cpp → ...Arnold/src/IECoreArnold/UniverseBlock.cpp
diff --git a/...reArnold/bindings/IECoreArnoldBinding.cpp → ...reArnold/bindings/IECoreArnoldBinding.cpp b/...reArnold/bindings/IECoreArnoldBinding.cpp → ...reArnold/bindings/IECoreArnoldBinding.cpp
diff --git a/...d/bindings/InstancingConverterBinding.cpp → ...d/bindings/InstancingConverterBinding.cpp b/...d/bindings/InstancingConverterBinding.cpp → ...d/bindings/InstancingConverterBinding.cpp
diff --git a/...IECoreArnold/bindings/RendererBinding.cpp → ...IECoreArnold/bindings/RendererBinding.cpp b/...IECoreArnold/bindings/RendererBinding.cpp → ...IECoreArnold/bindings/RendererBinding.cpp
diff --git a/...old/bindings/ToArnoldConverterBinding.cpp → ...old/bindings/ToArnoldConverterBinding.cpp b/...old/bindings/ToArnoldConverterBinding.cpp → ...old/bindings/ToArnoldConverterBinding.cpp
diff --git a/...ndings/ToArnoldCurvesConverterBinding.cpp → ...ndings/ToArnoldCurvesConverterBinding.cpp b/...ndings/ToArnoldCurvesConverterBinding.cpp → ...ndings/ToArnoldCurvesConverterBinding.cpp
diff --git a/...bindings/ToArnoldMeshConverterBinding.cpp → ...bindings/ToArnoldMeshConverterBinding.cpp b/...bindings/ToArnoldMeshConverterBinding.cpp → ...bindings/ToArnoldMeshConverterBinding.cpp
diff --git a/...ndings/ToArnoldPointsConverterBinding.cpp → ...ndings/ToArnoldPointsConverterBinding.cpp b/...ndings/ToArnoldPointsConverterBinding.cpp → ...ndings/ToArnoldPointsConverterBinding.cpp
diff --git a/...indings/ToArnoldShapeConverterBinding.cpp → ...indings/ToArnoldShapeConverterBinding.cpp b/...indings/ToArnoldShapeConverterBinding.cpp → ...indings/ToArnoldShapeConverterBinding.cpp
diff --git a/...eArnold/bindings/UniverseBlockBinding.cpp → ...eArnold/bindings/UniverseBlockBinding.cpp b/...eArnold/bindings/UniverseBlockBinding.cpp → ...eArnold/bindings/UniverseBlockBinding.cpp
diff --git a/...aExtension/ProceduralHolderTranslator.cpp → ...aExtension/ProceduralHolderTranslator.cpp b/...aExtension/ProceduralHolderTranslator.cpp → ...aExtension/ProceduralHolderTranslator.cpp
diff --git a/...ECoreArnold/outputDriver/OutputDriver.cpp → ...ECoreArnold/outputDriver/OutputDriver.cpp b/...ECoreArnold/outputDriver/OutputDriver.cpp → ...ECoreArnold/outputDriver/OutputDriver.cpp
diff --git a/...rc/IECoreArnold/procedural/Procedural.cpp → ...rc/IECoreArnold/procedural/Procedural.cpp b/...rc/IECoreArnold/procedural/Procedural.cpp → ...rc/IECoreArnold/procedural/Procedural.cpp
diff --git a/...rib/IECoreArnold/test/IECoreArnold/All.py → ...rib/IECoreArnold/test/IECoreArnold/All.py b/...rib/IECoreArnold/test/IECoreArnold/All.py → ...rib/IECoreArnold/test/IECoreArnold/All.py
diff --git a/...t/IECoreArnold/AutomaticInstancingTest.py → ...t/IECoreArnold/AutomaticInstancingTest.py b/...t/IECoreArnold/AutomaticInstancingTest.py → ...t/IECoreArnold/AutomaticInstancingTest.py
diff --git a/...t/IECoreArnold/InstancingConverterTest.py → ...t/IECoreArnold/InstancingConverterTest.py b/...t/IECoreArnold/InstancingConverterTest.py → ...t/IECoreArnold/InstancingConverterTest.py
diff --git a/...ECoreArnold/test/IECoreArnold/MeshTest.py → ...ECoreArnold/test/IECoreArnold/MeshTest.py b/...ECoreArnold/test/IECoreArnold/MeshTest.py → ...ECoreArnold/test/IECoreArnold/MeshTest.py
diff --git a/...old/test/IECoreArnold/OutputDriverTest.py → ...old/test/IECoreArnold/OutputDriverTest.py b/...old/test/IECoreArnold/OutputDriverTest.py → ...old/test/IECoreArnold/OutputDriverTest.py
diff --git a/...oreArnold/test/IECoreArnold/PointsTest.py → ...oreArnold/test/IECoreArnold/PointsTest.py b/...oreArnold/test/IECoreArnold/PointsTest.py → ...oreArnold/test/IECoreArnold/PointsTest.py
diff --git a/...ld/test/IECoreArnold/ProceduralDSOTest.py → ...ld/test/IECoreArnold/ProceduralDSOTest.py b/...ld/test/IECoreArnold/ProceduralDSOTest.py → ...ld/test/IECoreArnold/ProceduralDSOTest.py
diff --git a/...rnold/test/IECoreArnold/ProceduralTest.py → ...rnold/test/IECoreArnold/ProceduralTest.py b/...rnold/test/IECoreArnold/ProceduralTest.py → ...rnold/test/IECoreArnold/ProceduralTest.py
diff --git a/...eArnold/test/IECoreArnold/RendererTest.py → ...eArnold/test/IECoreArnold/RendererTest.py b/...eArnold/test/IECoreArnold/RendererTest.py → ...eArnold/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/...est/IECoreArnold/ToArnoldConverterTest.py → ...est/IECoreArnold/ToArnoldConverterTest.py b/...est/IECoreArnold/ToArnoldConverterTest.py → ...est/IECoreArnold/ToArnoldConverterTest.py
diff --git a/...ld/test/IECoreArnold/UniverseBlockTest.py → ...ld/test/IECoreArnold/UniverseBlockTest.py b/...ld/test/IECoreArnold/UniverseBlockTest.py → ...ld/test/IECoreArnold/UniverseBlockTest.py
diff --git a/...reArnold/data/assFiles/mergedDisplays.ass → ...reArnold/data/assFiles/mergedDisplays.ass b/...reArnold/data/assFiles/mergedDisplays.ass → ...reArnold/data/assFiles/mergedDisplays.ass
diff --git a/...oreArnold/data/assFiles/proceduralDSO.ass → ...oreArnold/data/assFiles/proceduralDSO.ass b/...oreArnold/data/assFiles/proceduralDSO.ass → ...oreArnold/data/assFiles/proceduralDSO.ass
diff --git a/.../data/assFiles/vectorAndPointDisplays.ass → .../data/assFiles/vectorAndPointDisplays.ass b/.../data/assFiles/vectorAndPointDisplays.ass → .../data/assFiles/vectorAndPointDisplays.ass
diff --git a/...IECoreArnold/data/curveImages/bSpline.exr → ...IECoreArnold/data/curveImages/bSpline.exr b/...IECoreArnold/data/curveImages/bSpline.exr → ...IECoreArnold/data/curveImages/bSpline.exr
diff --git a/.../IECoreArnold/data/curveImages/bezier.exr → .../IECoreArnold/data/curveImages/bezier.exr b/.../IECoreArnold/data/curveImages/bezier.exr → .../IECoreArnold/data/curveImages/bezier.exr
diff --git a/...rnold/data/meshImages/expectedMeshUVs.exr → ...rnold/data/meshImages/expectedMeshUVs.exr b/...rnold/data/meshImages/expectedMeshUVs.exr → ...rnold/data/meshImages/expectedMeshUVs.exr
diff --git a/...IECoreArnold/data/pointsImages/points.tif → ...IECoreArnold/data/pointsImages/points.tif b/...IECoreArnold/data/pointsImages/points.tif → ...IECoreArnold/data/pointsImages/points.tif
diff --git a/...0-a6/contrib/IECoreHoudini/CMakeLists.txt → ...-a10/contrib/IECoreHoudini/CMakeLists.txt b/...0-a6/contrib/IECoreHoudini/CMakeLists.txt → ...-a10/contrib/IECoreHoudini/CMakeLists.txt
diff --git a/...CoreHoudini/config/cmake/FindCortex.cmake → ...CoreHoudini/config/cmake/FindCortex.cmake b/...CoreHoudini/config/cmake/FindCortex.cmake → ...CoreHoudini/config/cmake/FindCortex.cmake
diff --git a/...oreHoudini/config/cmake/FindHoudini.cmake → ...oreHoudini/config/cmake/FindHoudini.cmake b/...oreHoudini/config/cmake/FindHoudini.cmake → ...oreHoudini/config/cmake/FindHoudini.cmake
diff --git a/.../IECoreHoudini/config/cmake/FindTBB.cmake → .../IECoreHoudini/config/cmake/FindTBB.cmake b/.../IECoreHoudini/config/cmake/FindTBB.cmake → .../IECoreHoudini/config/cmake/FindTBB.cmake
diff --git a/...nclude/IECoreMantra/ProceduralPrimitive.h → ...nclude/IECoreMantra/ProceduralPrimitive.h b/...nclude/IECoreMantra/ProceduralPrimitive.h → ...nclude/IECoreMantra/ProceduralPrimitive.h
diff --git a/...oreMantra/include/IECoreMantra/Renderer.h → ...oreMantra/include/IECoreMantra/Renderer.h b/...oreMantra/include/IECoreMantra/Renderer.h → ...oreMantra/include/IECoreMantra/Renderer.h
diff --git a/...CoreMantra/include/IECoreMantra/TypeIds.h → ...CoreMantra/include/IECoreMantra/TypeIds.h b/...CoreMantra/include/IECoreMantra/TypeIds.h → ...CoreMantra/include/IECoreMantra/TypeIds.h
diff --git a/...e/IECoreMantra/bindings/RendererBinding.h → ...e/IECoreMantra/bindings/RendererBinding.h b/...e/IECoreMantra/bindings/RendererBinding.h → ...e/IECoreMantra/bindings/RendererBinding.h
diff --git a/...reMantra/private/RendererImplementation.h → ...reMantra/private/RendererImplementation.h b/...reMantra/private/RendererImplementation.h → ...reMantra/private/RendererImplementation.h
diff --git a/.../IECoreMantra/ieCoreMantra/INDEX__SECTION → .../IECoreMantra/ieCoreMantra/INDEX__SECTION b/.../IECoreMantra/ieCoreMantra/INDEX__SECTION → .../IECoreMantra/ieCoreMantra/INDEX__SECTION
diff --git a/...s/IECoreMantra/ieCoreMantra/Sections.list → ...s/IECoreMantra/ieCoreMantra/Sections.list b/...s/IECoreMantra/ieCoreMantra/Sections.list → ...s/IECoreMantra/ieCoreMantra/Sections.list
diff --git a/...eMantra/Shop_1cortexMantraInject/Contents → ...eMantra/Shop_1cortexMantraInject/Contents b/...eMantra/Shop_1cortexMantraInject/Contents → ...eMantra/Shop_1cortexMantraInject/Contents
diff --git a/...hop_1cortexMantraInject/Contents.contents → ...hop_1cortexMantraInject/Contents.contents b/...hop_1cortexMantraInject/Contents.contents → ...hop_1cortexMantraInject/Contents.contents
diff --git a/...texMantraInject/Contents.dir/.OPdummydefs → ...texMantraInject/Contents.dir/.OPdummydefs b/...texMantraInject/Contents.dir/.OPdummydefs → ...texMantraInject/Contents.dir/.OPdummydefs
diff --git a/...ject/Contents.dir/cortexMantraInject1.def → ...ject/Contents.dir/cortexMantraInject1.def b/...ject/Contents.dir/cortexMantraInject1.def → ...ject/Contents.dir/cortexMantraInject1.def
diff --git a/...ect/Contents.dir/cortexMantraInject1.init → ...ect/Contents.dir/cortexMantraInject1.init b/...ect/Contents.dir/cortexMantraInject1.init → ...ect/Contents.dir/cortexMantraInject1.init
diff --git a/...ject/Contents.dir/cortexMantraInject1.net → ...ject/Contents.dir/cortexMantraInject1.net b/...ject/Contents.dir/cortexMantraInject1.net → ...ject/Contents.dir/cortexMantraInject1.net
diff --git a/...ct/Contents.dir/cortexMantraInject1.order → ...ct/Contents.dir/cortexMantraInject1.order b/...ct/Contents.dir/cortexMantraInject1.order → ...ct/Contents.dir/cortexMantraInject1.order
diff --git a/...Contents.dir/cortexMantraInject1.userdata → ...Contents.dir/cortexMantraInject1.userdata b/...Contents.dir/cortexMantraInject1.userdata → ...Contents.dir/cortexMantraInject1.userdata
diff --git a/...dir/cortexMantraInject1/ieprocedural1.chn → ...dir/cortexMantraInject1/ieprocedural1.chn b/...dir/cortexMantraInject1/ieprocedural1.chn → ...dir/cortexMantraInject1/ieprocedural1.chn
diff --git a/...dir/cortexMantraInject1/ieprocedural1.def → ...dir/cortexMantraInject1/ieprocedural1.def b/...dir/cortexMantraInject1/ieprocedural1.def → ...dir/cortexMantraInject1/ieprocedural1.def
diff --git a/...ir/cortexMantraInject1/ieprocedural1.init → ...ir/cortexMantraInject1/ieprocedural1.init b/...ir/cortexMantraInject1/ieprocedural1.init → ...ir/cortexMantraInject1/ieprocedural1.init
diff --git a/...ir/cortexMantraInject1/ieprocedural1.parm → ...ir/cortexMantraInject1/ieprocedural1.parm b/...ir/cortexMantraInject1/ieprocedural1.parm → ...ir/cortexMantraInject1/ieprocedural1.parm
diff --git a/...xMantraInject1/ieprocedural1.spareparmdef → ...xMantraInject1/ieprocedural1.spareparmdef b/...xMantraInject1/ieprocedural1.spareparmdef → ...xMantraInject1/ieprocedural1.spareparmdef
diff --git a/...ortexMantraInject1/ieprocedural1.userdata → ...ortexMantraInject1/ieprocedural1.userdata b/...ortexMantraInject1/ieprocedural1.userdata → ...ortexMantraInject1/ieprocedural1.userdata
diff --git a/...ts.dir/cortexMantraInject1/suboutput1.def → ...ts.dir/cortexMantraInject1/suboutput1.def b/...ts.dir/cortexMantraInject1/suboutput1.def → ...ts.dir/cortexMantraInject1/suboutput1.def
diff --git a/...s.dir/cortexMantraInject1/suboutput1.init → ...s.dir/cortexMantraInject1/suboutput1.init b/...s.dir/cortexMantraInject1/suboutput1.init → ...s.dir/cortexMantraInject1/suboutput1.init
diff --git a/...s.dir/cortexMantraInject1/suboutput1.parm → ...s.dir/cortexMantraInject1/suboutput1.parm b/...s.dir/cortexMantraInject1/suboutput1.parm → ...s.dir/cortexMantraInject1/suboutput1.parm
diff --git a/...r/cortexMantraInject1/suboutput1.userdata → ...r/cortexMantraInject1/suboutput1.userdata b/...r/cortexMantraInject1/suboutput1.userdata → ...r/cortexMantraInject1/suboutput1.userdata
diff --git a/...cortexMantraInject/Contents.dir/node_type → ...cortexMantraInject/Contents.dir/node_type b/...cortexMantraInject/Contents.dir/node_type → ...cortexMantraInject/Contents.dir/node_type
diff --git a/...ntra/Shop_1cortexMantraInject/Contents.gz → ...ntra/Shop_1cortexMantraInject/Contents.gz b/...ntra/Shop_1cortexMantraInject/Contents.gz → ...ntra/Shop_1cortexMantraInject/Contents.gz
diff --git a/...tra/Shop_1cortexMantraInject/CreateScript → ...tra/Shop_1cortexMantraInject/CreateScript b/...tra/Shop_1cortexMantraInject/CreateScript → ...tra/Shop_1cortexMantraInject/CreateScript
diff --git a/...tra/Shop_1cortexMantraInject/DialogScript → ...tra/Shop_1cortexMantraInject/DialogScript b/...tra/Shop_1cortexMantraInject/DialogScript → ...tra/Shop_1cortexMantraInject/DialogScript
diff --git a/...Shop_1cortexMantraInject/ExtraFileOptions → ...Shop_1cortexMantraInject/ExtraFileOptions b/...Shop_1cortexMantraInject/ExtraFileOptions → ...Shop_1cortexMantraInject/ExtraFileOptions
diff --git a/...eCoreMantra/Shop_1cortexMantraInject/Help → ...eCoreMantra/Shop_1cortexMantraInject/Help b/...eCoreMantra/Shop_1cortexMantraInject/Help → ...eCoreMantra/Shop_1cortexMantraInject/Help
diff --git a/...ra/Shop_1cortexMantraInject/Sections.list → ...ra/Shop_1cortexMantraInject/Sections.list b/...ra/Shop_1cortexMantraInject/Sections.list → ...ra/Shop_1cortexMantraInject/Sections.list
diff --git a/...ntra/Shop_1cortexMantraInject/Tools.shelf → ...ntra/Shop_1cortexMantraInject/Tools.shelf b/...ntra/Shop_1cortexMantraInject/Tools.shelf → ...ntra/Shop_1cortexMantraInject/Tools.shelf
diff --git a/...1cortexMantraInject/TypePropertiesOptions → ...1cortexMantraInject/TypePropertiesOptions b/...1cortexMantraInject/TypePropertiesOptions → ...1cortexMantraInject/TypePropertiesOptions
diff --git a/...oreMantra/Shop_1ieprocedural/CreateScript → ...oreMantra/Shop_1ieprocedural/CreateScript b/...oreMantra/Shop_1ieprocedural/CreateScript → ...oreMantra/Shop_1ieprocedural/CreateScript
diff --git a/...oreMantra/Shop_1ieprocedural/DialogScript → ...oreMantra/Shop_1ieprocedural/DialogScript b/...oreMantra/Shop_1ieprocedural/DialogScript → ...oreMantra/Shop_1ieprocedural/DialogScript
diff --git a/...antra/Shop_1ieprocedural/ExtraFileOptions → ...antra/Shop_1ieprocedural/ExtraFileOptions b/...antra/Shop_1ieprocedural/ExtraFileOptions → ...antra/Shop_1ieprocedural/ExtraFileOptions
diff --git a/...ntra/ieCoreMantra/Shop_1ieprocedural/Help → ...ntra/ieCoreMantra/Shop_1ieprocedural/Help b/...ntra/ieCoreMantra/Shop_1ieprocedural/Help → ...ntra/ieCoreMantra/Shop_1ieprocedural/Help
diff --git a/...reMantra/Shop_1ieprocedural/Sections.list → ...reMantra/Shop_1ieprocedural/Sections.list b/...reMantra/Shop_1ieprocedural/Sections.list → ...reMantra/Shop_1ieprocedural/Sections.list
diff --git a/...CoreMantra/Shop_1ieprocedural/Tools.shelf → ...CoreMantra/Shop_1ieprocedural/Tools.shelf b/...CoreMantra/Shop_1ieprocedural/Tools.shelf → ...CoreMantra/Shop_1ieprocedural/Tools.shelf
diff --git a/.../Shop_1ieprocedural/TypePropertiesOptions → .../Shop_1ieprocedural/TypePropertiesOptions b/.../Shop_1ieprocedural/TypePropertiesOptions → .../Shop_1ieprocedural/TypePropertiesOptions
diff --git a/...oreMantra/python/IECoreMantra/__init__.py → ...oreMantra/python/IECoreMantra/__init__.py b/...oreMantra/python/IECoreMantra/__init__.py → ...oreMantra/python/IECoreMantra/__init__.py
diff --git a/.../src/IECoreMantra/ProceduralPrimitive.cpp → .../src/IECoreMantra/ProceduralPrimitive.cpp b/.../src/IECoreMantra/ProceduralPrimitive.cpp → .../src/IECoreMantra/ProceduralPrimitive.cpp
diff --git a/...ECoreMantra/src/IECoreMantra/Renderer.cpp → ...ECoreMantra/src/IECoreMantra/Renderer.cpp b/...ECoreMantra/src/IECoreMantra/Renderer.cpp → ...ECoreMantra/src/IECoreMantra/Renderer.cpp
diff --git a/...c/IECoreMantra/RendererImplementation.cpp → ...c/IECoreMantra/RendererImplementation.cpp b/...c/IECoreMantra/RendererImplementation.cpp → ...c/IECoreMantra/RendererImplementation.cpp
diff --git a/...reMantra/bindings/IECoreMantraBinding.cpp → ...reMantra/bindings/IECoreMantraBinding.cpp b/...reMantra/bindings/IECoreMantraBinding.cpp → ...reMantra/bindings/IECoreMantraBinding.cpp
diff --git a/...IECoreMantra/bindings/RendererBinding.cpp → ...IECoreMantra/bindings/RendererBinding.cpp b/...IECoreMantra/bindings/RendererBinding.cpp → ...IECoreMantra/bindings/RendererBinding.cpp
diff --git a/...rc/IECoreMantra/procedural/Procedural.cpp → ...rc/IECoreMantra/procedural/Procedural.cpp b/...rc/IECoreMantra/procedural/Procedural.cpp → ...rc/IECoreMantra/procedural/Procedural.cpp
diff --git a/...rc/IECoreMantra/procedural/VRAYprocedural → ...rc/IECoreMantra/procedural/VRAYprocedural b/...rc/IECoreMantra/procedural/VRAYprocedural → ...rc/IECoreMantra/procedural/VRAYprocedural
diff --git a/...tra/src/IECoreMantra/procedural/World.cpp → ...tra/src/IECoreMantra/procedural/World.cpp b/...tra/src/IECoreMantra/procedural/World.cpp → ...tra/src/IECoreMantra/procedural/World.cpp
diff --git a/...rib/IECoreMantra/test/IECoreMantra/All.py → ...rib/IECoreMantra/test/IECoreMantra/All.py b/...rib/IECoreMantra/test/IECoreMantra/All.py → ...rib/IECoreMantra/test/IECoreMantra/All.py
diff --git a/...eMantra/test/IECoreMantra/RendererTest.py → ...eMantra/test/IECoreMantra/RendererTest.py b/...eMantra/test/IECoreMantra/RendererTest.py → ...eMantra/test/IECoreMantra/RendererTest.py
diff --git a/...eMantra/test/IECoreMantra/data/sphere.cob → ...eMantra/test/IECoreMantra/data/sphere.cob b/...eMantra/test/IECoreMantra/data/sphere.cob → ...eMantra/test/IECoreMantra/data/sphere.cob
diff --git a/...a/test/IECoreMantra/data/testGeometry.tif → ...a/test/IECoreMantra/data/testGeometry.tif b/...a/test/IECoreMantra/data/testGeometry.tif → ...a/test/IECoreMantra/data/testGeometry.tif
diff --git a/.../test/IECoreMantra/data/testWorldMesh.tif → .../test/IECoreMantra/data/testWorldMesh.tif b/.../test/IECoreMantra/data/testWorldMesh.tif → .../test/IECoreMantra/data/testWorldMesh.tif
diff --git a/...ls/sphereProcedural/sphereProcedural-1.py → ...ls/sphereProcedural/sphereProcedural-1.py b/...ls/sphereProcedural/sphereProcedural-1.py → ...ls/sphereProcedural/sphereProcedural-1.py
diff --git a/...trib/for_review/MayaOp/publishCamera-1.py → ...trib/for_review/MayaOp/publishCamera-1.py b/...trib/for_review/MayaOp/publishCamera-1.py → ...trib/for_review/MayaOp/publishCamera-1.py
diff --git a/...dBasicPreset/python/IECore/BasicPreset.py → ...dBasicPreset/python/IECore/BasicPreset.py b/...dBasicPreset/python/IECore/BasicPreset.py → ...dBasicPreset/python/IECore/BasicPreset.py
diff --git a/...iedBasicPreset/test/IECore/BasicPreset.py → ...iedBasicPreset/test/IECore/BasicPreset.py b/...iedBasicPreset/test/IECore/BasicPreset.py → ...iedBasicPreset/test/IECore/BasicPreset.py
diff --git a/...ve_DrD/include/IECore/SkeletonPrimitive.h → ...ve_DrD/include/IECore/SkeletonPrimitive.h b/...ve_DrD/include/IECore/SkeletonPrimitive.h → ...ve_DrD/include/IECore/SkeletonPrimitive.h
diff --git a/...tonPrimitive_DrD/include/IECore/TypeIds.h → ...tonPrimitive_DrD/include/IECore/TypeIds.h b/...tonPrimitive_DrD/include/IECore/TypeIds.h → ...tonPrimitive_DrD/include/IECore/TypeIds.h
diff --git a/...tive_DrD/include/IECoreGL/ConePrimitive.h → ...tive_DrD/include/IECoreGL/ConePrimitive.h b/...tive_DrD/include/IECoreGL/ConePrimitive.h → ...tive_DrD/include/IECoreGL/ConePrimitive.h
diff --git a/...ive_DrD/include/IECoreGL/JointPrimitive.h → ...ive_DrD/include/IECoreGL/JointPrimitive.h b/...ive_DrD/include/IECoreGL/JointPrimitive.h → ...ive_DrD/include/IECoreGL/JointPrimitive.h
diff --git a/..._DrD/include/IECoreGL/SkeletonPrimitive.h → ..._DrD/include/IECoreGL/SkeletonPrimitive.h b/..._DrD/include/IECoreGL/SkeletonPrimitive.h → ..._DrD/include/IECoreGL/SkeletonPrimitive.h
diff --git a/...nPrimitive_DrD/include/IECoreGL/TypeIds.h → ...nPrimitive_DrD/include/IECoreGL/TypeIds.h b/...nPrimitive_DrD/include/IECoreGL/TypeIds.h → ...nPrimitive_DrD/include/IECoreGL/TypeIds.h
diff --git a/...IECoreGL/bindings/JointPrimitiveBinding.h → ...IECoreGL/bindings/JointPrimitiveBinding.h b/...IECoreGL/bindings/JointPrimitiveBinding.h → ...IECoreGL/bindings/JointPrimitiveBinding.h
diff --git a/...e/IECorePython/SkeletonPrimitiveBinding.h → ...e/IECorePython/SkeletonPrimitiveBinding.h b/...e/IECorePython/SkeletonPrimitiveBinding.h → ...e/IECorePython/SkeletonPrimitiveBinding.h
diff --git a/...etonPrimitiveIO/exportSkeletonFromMaya.py → ...etonPrimitiveIO/exportSkeletonFromMaya.py b/...etonPrimitiveIO/exportSkeletonFromMaya.py → ...etonPrimitiveIO/exportSkeletonFromMaya.py
diff --git a/...O/skeletonPrimitivesUtilities/__init__.py → ...O/skeletonPrimitivesUtilities/__init__.py b/...O/skeletonPrimitivesUtilities/__init__.py → ...O/skeletonPrimitivesUtilities/__init__.py
diff --git a/...rimitivesUtilities/skeletonPrimitiveIO.py → ...rimitivesUtilities/skeletonPrimitiveIO.py b/...rimitivesUtilities/skeletonPrimitiveIO.py → ...rimitivesUtilities/skeletonPrimitiveIO.py
diff --git a/...tive_DrD/src/IECore/SkeletonPrimitive.cpp → ...tive_DrD/src/IECore/SkeletonPrimitive.cpp b/...tive_DrD/src/IECore/SkeletonPrimitive.cpp → ...tive_DrD/src/IECore/SkeletonPrimitive.cpp
diff --git a/...mitive_DrD/src/IECoreGL/ConePrimitive.cpp → ...mitive_DrD/src/IECoreGL/ConePrimitive.cpp b/...mitive_DrD/src/IECoreGL/ConePrimitive.cpp → ...mitive_DrD/src/IECoreGL/ConePrimitive.cpp
diff --git a/...itive_DrD/src/IECoreGL/JointPrimitive.cpp → ...itive_DrD/src/IECoreGL/JointPrimitive.cpp b/...itive_DrD/src/IECoreGL/JointPrimitive.cpp → ...itive_DrD/src/IECoreGL/JointPrimitive.cpp
diff --git a/...onPrimitive_DrD/src/IECoreGL/Renderer.cpp → ...onPrimitive_DrD/src/IECoreGL/Renderer.cpp b/...onPrimitive_DrD/src/IECoreGL/Renderer.cpp → ...onPrimitive_DrD/src/IECoreGL/Renderer.cpp
diff --git a/...ve_DrD/src/IECoreGL/SkeletonPrimitive.cpp → ...ve_DrD/src/IECoreGL/SkeletonPrimitive.cpp b/...ve_DrD/src/IECoreGL/SkeletonPrimitive.cpp → ...ve_DrD/src/IECoreGL/SkeletonPrimitive.cpp
diff --git a/...CoreGL/bindings/JointPrimitiveBinding.cpp → ...CoreGL/bindings/JointPrimitiveBinding.cpp b/...CoreGL/bindings/JointPrimitiveBinding.cpp → ...CoreGL/bindings/JointPrimitiveBinding.cpp
diff --git a/...IECorePython/SkeletonPrimitiveBinding.cpp → ...IECorePython/SkeletonPrimitiveBinding.cpp b/...IECorePython/SkeletonPrimitiveBinding.cpp → ...IECorePython/SkeletonPrimitiveBinding.cpp
diff --git a/...ve_DrD/src/IECorePython/TypeIdBinding.cpp → ...ve_DrD/src/IECorePython/TypeIdBinding.cpp b/...ve_DrD/src/IECorePython/TypeIdBinding.cpp → ...ve_DrD/src/IECorePython/TypeIdBinding.cpp
diff --git a/...ive_DrD/src/IECorePythonModule/IECore.cpp → ...ive_DrD/src/IECorePythonModule/IECore.cpp b/...ive_DrD/src/IECorePythonModule/IECore.cpp → ...ive_DrD/src/IECorePythonModule/IECore.cpp
diff --git a/.../SkeletonPrimitive_DrD/test/IECore/All.py → .../SkeletonPrimitive_DrD/test/IECore/All.py b/.../SkeletonPrimitive_DrD/test/IECore/All.py → .../SkeletonPrimitive_DrD/test/IECore/All.py
diff --git a/..._DrD/test/IECore/SkeletonPrimitiveTest.py → ..._DrD/test/IECore/SkeletonPrimitiveTest.py b/..._DrD/test/IECore/SkeletonPrimitiveTest.py → ..._DrD/test/IECore/SkeletonPrimitiveTest.py
diff --git a/...build_configurations/osx/SConstruct.patch → ...build_configurations/osx/SConstruct.patch b/...build_configurations/osx/SConstruct.patch → ...build_configurations/osx/SConstruct.patch
diff --git a/...d_configurations/osx/options-maya2011.txt → ...d_configurations/osx/options-maya2011.txt b/...d_configurations/osx/options-maya2011.txt → ...d_configurations/osx/options-maya2011.txt
diff --git a/...eview/build_configurations/osx/readme.txt → ...eview/build_configurations/osx/readme.txt b/...eview/build_configurations/osx/readme.txt → ...eview/build_configurations/osx/readme.txt
diff --git a/...rmats/include/IECore/BGEOParticleReader.h → ...rmats/include/IECore/BGEOParticleReader.h b/...rmats/include/IECore/BGEOParticleReader.h → ...rmats/include/IECore/BGEOParticleReader.h
diff --git a/...eadFormats/include/IECore/BINMeshReader.h → ...eadFormats/include/IECore/BINMeshReader.h b/...eadFormats/include/IECore/BINMeshReader.h → ...eadFormats/include/IECore/BINMeshReader.h
diff --git a/...ormats/include/IECore/BINParticleWriter.h → ...ormats/include/IECore/BINParticleWriter.h b/...ormats/include/IECore/BINParticleWriter.h → ...ormats/include/IECore/BINParticleWriter.h
diff --git a/...eadFormats/include/IECore/IFFHairReader.h → ...eadFormats/include/IECore/IFFHairReader.h b/...eadFormats/include/IECore/IFFHairReader.h → ...eadFormats/include/IECore/IFFHairReader.h
diff --git a/.../IECorePython/BGEOParticleReaderBinding.h → .../IECorePython/BGEOParticleReaderBinding.h b/.../IECorePython/BGEOParticleReaderBinding.h → .../IECorePython/BGEOParticleReaderBinding.h
diff --git a/...clude/IECorePython/BINMeshReaderBinding.h → ...clude/IECorePython/BINMeshReaderBinding.h b/...clude/IECorePython/BINMeshReaderBinding.h → ...clude/IECorePython/BINMeshReaderBinding.h
diff --git a/...e/IECorePython/BINParticleWriterBinding.h → ...e/IECorePython/BINParticleWriterBinding.h b/...e/IECorePython/BINParticleWriterBinding.h → ...e/IECorePython/BINParticleWriterBinding.h
diff --git a/...clude/IECorePython/IFFHairReaderBinding.h → ...clude/IECorePython/IFFHairReaderBinding.h b/...clude/IECorePython/IFFHairReaderBinding.h → ...clude/IECorePython/IFFHairReaderBinding.h
diff --git a/...Formats/src/IECore/BGEOParticleReader.cpp → ...Formats/src/IECore/BGEOParticleReader.cpp b/...Formats/src/IECore/BGEOParticleReader.cpp → ...Formats/src/IECore/BGEOParticleReader.cpp
diff --git a/.../deadFormats/src/IECore/BINMeshReader.cpp → .../deadFormats/src/IECore/BINMeshReader.cpp b/.../deadFormats/src/IECore/BINMeshReader.cpp → .../deadFormats/src/IECore/BINMeshReader.cpp
diff --git a/...dFormats/src/IECore/BINParticleWriter.cpp → ...dFormats/src/IECore/BINParticleWriter.cpp b/...dFormats/src/IECore/BINParticleWriter.cpp → ...dFormats/src/IECore/BINParticleWriter.cpp
diff --git a/.../deadFormats/src/IECore/IFFHairReader.cpp → .../deadFormats/src/IECore/IFFHairReader.cpp b/.../deadFormats/src/IECore/IFFHairReader.cpp → .../deadFormats/src/IECore/IFFHairReader.cpp
diff --git a/...ECorePython/BGEOParticleReaderBinding.cpp → ...ECorePython/BGEOParticleReaderBinding.cpp b/...ECorePython/BGEOParticleReaderBinding.cpp → ...ECorePython/BGEOParticleReaderBinding.cpp
diff --git a/...src/IECorePython/BINMeshReaderBinding.cpp → ...src/IECorePython/BINMeshReaderBinding.cpp b/...src/IECorePython/BINMeshReaderBinding.cpp → ...src/IECorePython/BINMeshReaderBinding.cpp
diff --git a/...IECorePython/BINParticleWriterBinding.cpp → ...IECorePython/BINParticleWriterBinding.cpp b/...IECorePython/BINParticleWriterBinding.cpp → ...IECorePython/BINParticleWriterBinding.cpp
diff --git a/...src/IECorePython/IFFHairReaderBinding.cpp → ...src/IECorePython/IFFHairReaderBinding.cpp b/...src/IECorePython/IFFHairReaderBinding.cpp → ...src/IECorePython/IFFHairReaderBinding.cpp
diff --git a/...Formats/test/IECore/BGEOParticleReader.py → ...Formats/test/IECore/BGEOParticleReader.py b/...Formats/test/IECore/BGEOParticleReader.py → ...Formats/test/IECore/BGEOParticleReader.py
diff --git a/...dFormats/test/IECore/BINMeshReaderTest.py → ...dFormats/test/IECore/BINMeshReaderTest.py b/...dFormats/test/IECore/BINMeshReaderTest.py → ...dFormats/test/IECore/BINMeshReaderTest.py
diff --git a/...mats/test/IECore/BINParticleWriterTest.py → ...mats/test/IECore/BINParticleWriterTest.py b/...mats/test/IECore/BINParticleWriterTest.py → ...mats/test/IECore/BINParticleWriterTest.py
diff --git a/.../deadFormats/test/IECore/IFFHairReader.py → .../deadFormats/test/IECore/IFFHairReader.py b/.../deadFormats/test/IECore/IFFHairReader.py → .../deadFormats/test/IECore/IFFHairReader.py
diff --git a/...ore/data/bgeoFiles/particleTest.0004.bgeo → ...ore/data/bgeoFiles/particleTest.0004.bgeo b/...ore/data/bgeoFiles/particleTest.0004.bgeo → ...ore/data/bgeoFiles/particleTest.0004.bgeo
diff --git a/...ore/data/bgeoFiles/particleTest.0006.bgeo → ...ore/data/bgeoFiles/particleTest.0006.bgeo b/...ore/data/bgeoFiles/particleTest.0006.bgeo → ...ore/data/bgeoFiles/particleTest.0006.bgeo
diff --git a/...ormats/test/IECore/data/binFiles/mesh.bin → ...ormats/test/IECore/data/binFiles/mesh.bin b/...ormats/test/IECore/data/binFiles/mesh.bin → ...ormats/test/IECore/data/binFiles/mesh.bin
diff --git a/...test/IECore/data/iffFiles/hairSystem.mchp → ...test/IECore/data/iffFiles/hairSystem.mchp b/...test/IECore/data/iffFiles/hairSystem.mchp → ...test/IECore/data/iffFiles/hairSystem.mchp
diff --git a/...ECore/data/iffFiles/sparseHairSystem.mchp → ...ECore/data/iffFiles/sparseHairSystem.mchp b/...ECore/data/iffFiles/sparseHairSystem.mchp → ...ECore/data/iffFiles/sparseHairSystem.mchp
diff --git a/...de/IECore/BlobbyImplicitSurfaceFunction.h → ...de/IECore/BlobbyImplicitSurfaceFunction.h b/...de/IECore/BlobbyImplicitSurfaceFunction.h → ...de/IECore/BlobbyImplicitSurfaceFunction.h
diff --git a/.../IECore/BlobbyImplicitSurfaceFunction.inl → .../IECore/BlobbyImplicitSurfaceFunction.inl b/.../IECore/BlobbyImplicitSurfaceFunction.inl → .../IECore/BlobbyImplicitSurfaceFunction.inl
diff --git a/...clude/IECore/CSGImplicitSurfaceFunction.h → ...clude/IECore/CSGImplicitSurfaceFunction.h b/...clude/IECore/CSGImplicitSurfaceFunction.h → ...clude/IECore/CSGImplicitSurfaceFunction.h
diff --git a/...ude/IECore/CSGImplicitSurfaceFunction.inl → ...ude/IECore/CSGImplicitSurfaceFunction.inl b/...ude/IECore/CSGImplicitSurfaceFunction.inl → ...ude/IECore/CSGImplicitSurfaceFunction.inl
diff --git a/...de/IECore/CachedImplicitSurfaceFunction.h → ...de/IECore/CachedImplicitSurfaceFunction.h b/...de/IECore/CachedImplicitSurfaceFunction.h → ...de/IECore/CachedImplicitSurfaceFunction.h
diff --git a/.../IECore/CachedImplicitSurfaceFunction.inl → .../IECore/CachedImplicitSurfaceFunction.inl b/.../IECore/CachedImplicitSurfaceFunction.inl → .../IECore/CachedImplicitSurfaceFunction.inl
diff --git a/.../include/IECore/ImplicitSurfaceFunction.h → .../include/IECore/ImplicitSurfaceFunction.h b/.../include/IECore/ImplicitSurfaceFunction.h → .../include/IECore/ImplicitSurfaceFunction.h
diff --git a/...itSurfaces/include/IECore/MarchingCubes.h → ...itSurfaces/include/IECore/MarchingCubes.h b/...itSurfaces/include/IECore/MarchingCubes.h → ...itSurfaces/include/IECore/MarchingCubes.h
diff --git a/...Surfaces/include/IECore/MarchingCubes.inl → ...Surfaces/include/IECore/MarchingCubes.inl b/...Surfaces/include/IECore/MarchingCubes.inl → ...Surfaces/include/IECore/MarchingCubes.inl
diff --git a/...ces/include/IECore/MarchingCubesBinding.h → ...ces/include/IECore/MarchingCubesBinding.h b/...ces/include/IECore/MarchingCubesBinding.h → ...ces/include/IECore/MarchingCubesBinding.h
diff --git a/...re/MeshPrimitiveImplicitSurfaceFunction.h → ...re/MeshPrimitiveImplicitSurfaceFunction.h b/...re/MeshPrimitiveImplicitSurfaceFunction.h → ...re/MeshPrimitiveImplicitSurfaceFunction.h
diff --git a/...e/IECore/MeshPrimitiveImplicitSurfaceOp.h → ...e/IECore/MeshPrimitiveImplicitSurfaceOp.h b/...e/IECore/MeshPrimitiveImplicitSurfaceOp.h → ...e/IECore/MeshPrimitiveImplicitSurfaceOp.h
diff --git a/...tSurfaces/include/IECore/ParticleMeshOp.h → ...tSurfaces/include/IECore/ParticleMeshOp.h b/...tSurfaces/include/IECore/ParticleMeshOp.h → ...tSurfaces/include/IECore/ParticleMeshOp.h
diff --git a/...ude/IECore/PlaneImplicitSurfaceFunction.h → ...ude/IECore/PlaneImplicitSurfaceFunction.h b/...ude/IECore/PlaneImplicitSurfaceFunction.h → ...ude/IECore/PlaneImplicitSurfaceFunction.h
diff --git a/...icitSurfaces/include/IECore/PointMeshOp.h → ...icitSurfaces/include/IECore/PointMeshOp.h b/...icitSurfaces/include/IECore/PointMeshOp.h → ...icitSurfaces/include/IECore/PointMeshOp.h
diff --git a/...IECore/PrimitiveImplicitSurfaceFunction.h → ...IECore/PrimitiveImplicitSurfaceFunction.h b/...IECore/PrimitiveImplicitSurfaceFunction.h → ...IECore/PrimitiveImplicitSurfaceFunction.h
diff --git a/...de/IECore/SphereImplicitSurfaceFunction.h → ...de/IECore/SphereImplicitSurfaceFunction.h b/...de/IECore/SphereImplicitSurfaceFunction.h → ...de/IECore/SphereImplicitSurfaceFunction.h
diff --git a/...ECore/ZhuBridsonImplicitSurfaceFunction.h → ...ECore/ZhuBridsonImplicitSurfaceFunction.h b/...ECore/ZhuBridsonImplicitSurfaceFunction.h → ...ECore/ZhuBridsonImplicitSurfaceFunction.h
diff --git a/...ore/ZhuBridsonImplicitSurfaceFunction.inl → ...ore/ZhuBridsonImplicitSurfaceFunction.inl b/...ore/ZhuBridsonImplicitSurfaceFunction.inl → ...ore/ZhuBridsonImplicitSurfaceFunction.inl
diff --git a/...on/BlobbyImplicitSurfaceFunctionBinding.h → ...on/BlobbyImplicitSurfaceFunctionBinding.h b/...on/BlobbyImplicitSurfaceFunctionBinding.h → ...on/BlobbyImplicitSurfaceFunctionBinding.h
diff --git a/...ython/CSGImplicitSurfaceFunctionBinding.h → ...ython/CSGImplicitSurfaceFunctionBinding.h b/...ython/CSGImplicitSurfaceFunctionBinding.h → ...ython/CSGImplicitSurfaceFunctionBinding.h
diff --git a/...on/CachedImplicitSurfaceFunctionBinding.h → ...on/CachedImplicitSurfaceFunctionBinding.h b/...on/CachedImplicitSurfaceFunctionBinding.h → ...on/CachedImplicitSurfaceFunctionBinding.h
diff --git a/...rePython/ImplicitSurfaceFunctionBinding.h → ...rePython/ImplicitSurfaceFunctionBinding.h b/...rePython/ImplicitSurfaceFunctionBinding.h → ...rePython/ImplicitSurfaceFunctionBinding.h
diff --git a/...PrimitiveImplicitSurfaceFunctionBinding.h → ...PrimitiveImplicitSurfaceFunctionBinding.h b/...PrimitiveImplicitSurfaceFunctionBinding.h → ...PrimitiveImplicitSurfaceFunctionBinding.h
diff --git a/...n/MeshPrimitiveImplicitSurfaceOpBinding.h → ...n/MeshPrimitiveImplicitSurfaceOpBinding.h b/...n/MeshPrimitiveImplicitSurfaceOpBinding.h → ...n/MeshPrimitiveImplicitSurfaceOpBinding.h
diff --git a/...lude/IECorePython/ParticleMeshOpBinding.h → ...lude/IECorePython/ParticleMeshOpBinding.h b/...lude/IECorePython/ParticleMeshOpBinding.h → ...lude/IECorePython/ParticleMeshOpBinding.h
diff --git a/...hon/PlaneImplicitSurfaceFunctionBinding.h → ...hon/PlaneImplicitSurfaceFunctionBinding.h b/...hon/PlaneImplicitSurfaceFunctionBinding.h → ...hon/PlaneImplicitSurfaceFunctionBinding.h
diff --git a/...include/IECorePython/PointMeshOpBinding.h → ...include/IECorePython/PointMeshOpBinding.h b/...include/IECorePython/PointMeshOpBinding.h → ...include/IECorePython/PointMeshOpBinding.h
diff --git a/...PrimitiveImplicitSurfaceFunctionBinding.h → ...PrimitiveImplicitSurfaceFunctionBinding.h b/...PrimitiveImplicitSurfaceFunctionBinding.h → ...PrimitiveImplicitSurfaceFunctionBinding.h
diff --git a/...on/SphereImplicitSurfaceFunctionBinding.h → ...on/SphereImplicitSurfaceFunctionBinding.h b/...on/SphereImplicitSurfaceFunctionBinding.h → ...on/SphereImplicitSurfaceFunctionBinding.h
diff --git a/...huBridsonImplicitSurfaceFunctionBinding.h → ...huBridsonImplicitSurfaceFunctionBinding.h b/...huBridsonImplicitSurfaceFunctionBinding.h → ...huBridsonImplicitSurfaceFunctionBinding.h
diff --git a/.../MeshPrimitiveImplicitSurfaceFunction.cpp → .../MeshPrimitiveImplicitSurfaceFunction.cpp b/.../MeshPrimitiveImplicitSurfaceFunction.cpp → .../MeshPrimitiveImplicitSurfaceFunction.cpp
diff --git a/...IECore/MeshPrimitiveImplicitSurfaceOp.cpp → ...IECore/MeshPrimitiveImplicitSurfaceOp.cpp b/...IECore/MeshPrimitiveImplicitSurfaceOp.cpp → ...IECore/MeshPrimitiveImplicitSurfaceOp.cpp
diff --git a/...citSurfaces/src/IECore/ParticleMeshOp.cpp → ...citSurfaces/src/IECore/ParticleMeshOp.cpp b/...citSurfaces/src/IECore/ParticleMeshOp.cpp → ...citSurfaces/src/IECore/ParticleMeshOp.cpp
diff --git a/...plicitSurfaces/src/IECore/PointMeshOp.cpp → ...plicitSurfaces/src/IECore/PointMeshOp.cpp b/...plicitSurfaces/src/IECore/PointMeshOp.cpp → ...plicitSurfaces/src/IECore/PointMeshOp.cpp
diff --git a/...Core/PrimitiveImplicitSurfaceFunction.cpp → ...Core/PrimitiveImplicitSurfaceFunction.cpp b/...Core/PrimitiveImplicitSurfaceFunction.cpp → ...Core/PrimitiveImplicitSurfaceFunction.cpp
diff --git a/.../BlobbyImplicitSurfaceFunctionBinding.cpp → .../BlobbyImplicitSurfaceFunctionBinding.cpp b/.../BlobbyImplicitSurfaceFunctionBinding.cpp → .../BlobbyImplicitSurfaceFunctionBinding.cpp
diff --git a/...hon/CSGImplicitSurfaceFunctionBinding.cpp → ...hon/CSGImplicitSurfaceFunctionBinding.cpp b/...hon/CSGImplicitSurfaceFunctionBinding.cpp → ...hon/CSGImplicitSurfaceFunctionBinding.cpp
diff --git a/.../CachedImplicitSurfaceFunctionBinding.cpp → .../CachedImplicitSurfaceFunctionBinding.cpp b/.../CachedImplicitSurfaceFunctionBinding.cpp → .../CachedImplicitSurfaceFunctionBinding.cpp
diff --git a/...Python/ImplicitSurfaceFunctionBinding.cpp → ...Python/ImplicitSurfaceFunctionBinding.cpp b/...Python/ImplicitSurfaceFunctionBinding.cpp → ...Python/ImplicitSurfaceFunctionBinding.cpp
diff --git a/...src/IECorePython/MarchingCubesBinding.cpp → ...src/IECorePython/MarchingCubesBinding.cpp b/...src/IECorePython/MarchingCubesBinding.cpp → ...src/IECorePython/MarchingCubesBinding.cpp
diff --git a/...imitiveImplicitSurfaceFunctionBinding.cpp → ...imitiveImplicitSurfaceFunctionBinding.cpp b/...imitiveImplicitSurfaceFunctionBinding.cpp → ...imitiveImplicitSurfaceFunctionBinding.cpp
diff --git a/...MeshPrimitiveImplicitSurfaceOpBinding.cpp → ...MeshPrimitiveImplicitSurfaceOpBinding.cpp b/...MeshPrimitiveImplicitSurfaceOpBinding.cpp → ...MeshPrimitiveImplicitSurfaceOpBinding.cpp
diff --git a/...rc/IECorePython/ParticleMeshOpBinding.cpp → ...rc/IECorePython/ParticleMeshOpBinding.cpp b/...rc/IECorePython/ParticleMeshOpBinding.cpp → ...rc/IECorePython/ParticleMeshOpBinding.cpp
diff --git a/...n/PlaneImplicitSurfaceFunctionBinding.cpp → ...n/PlaneImplicitSurfaceFunctionBinding.cpp b/...n/PlaneImplicitSurfaceFunctionBinding.cpp → ...n/PlaneImplicitSurfaceFunctionBinding.cpp
diff --git a/...s/src/IECorePython/PointMeshOpBinding.cpp → ...s/src/IECorePython/PointMeshOpBinding.cpp b/...s/src/IECorePython/PointMeshOpBinding.cpp → ...s/src/IECorePython/PointMeshOpBinding.cpp
diff --git a/...imitiveImplicitSurfaceFunctionBinding.cpp → ...imitiveImplicitSurfaceFunctionBinding.cpp b/...imitiveImplicitSurfaceFunctionBinding.cpp → ...imitiveImplicitSurfaceFunctionBinding.cpp
diff --git a/.../SphereImplicitSurfaceFunctionBinding.cpp → .../SphereImplicitSurfaceFunctionBinding.cpp b/.../SphereImplicitSurfaceFunctionBinding.cpp → .../SphereImplicitSurfaceFunctionBinding.cpp
diff --git a/...BridsonImplicitSurfaceFunctionBinding.cpp → ...BridsonImplicitSurfaceFunctionBinding.cpp b/...BridsonImplicitSurfaceFunctionBinding.cpp → ...BridsonImplicitSurfaceFunctionBinding.cpp
diff --git a/...test/IECore/CSGImplicitSurfaceFunction.py → ...test/IECore/CSGImplicitSurfaceFunction.py b/...test/IECore/CSGImplicitSurfaceFunction.py → ...test/IECore/CSGImplicitSurfaceFunction.py
diff --git a/...t/IECore/CachedImplicitSurfaceFunction.py → ...t/IECore/CachedImplicitSurfaceFunction.py b/...t/IECore/CachedImplicitSurfaceFunction.py → ...t/IECore/CachedImplicitSurfaceFunction.py
diff --git a/...es/test/IECore/ImplicitSurfaceFunction.py → ...es/test/IECore/ImplicitSurfaceFunction.py b/...es/test/IECore/ImplicitSurfaceFunction.py → ...es/test/IECore/ImplicitSurfaceFunction.py
diff --git a/...icitSurfaces/test/IECore/MarchingCubes.py → ...icitSurfaces/test/IECore/MarchingCubes.py b/...icitSurfaces/test/IECore/MarchingCubes.py → ...icitSurfaces/test/IECore/MarchingCubes.py
diff --git a/...urfaces/test/IECore/MarchingCubesTest.cpp → ...urfaces/test/IECore/MarchingCubesTest.cpp b/...urfaces/test/IECore/MarchingCubesTest.cpp → ...urfaces/test/IECore/MarchingCubesTest.cpp
diff --git a/...tSurfaces/test/IECore/MarchingCubesTest.h → ...tSurfaces/test/IECore/MarchingCubesTest.h b/...tSurfaces/test/IECore/MarchingCubesTest.h → ...tSurfaces/test/IECore/MarchingCubesTest.h
diff --git a/.../IECore/MeshPrimitiveImplicitSurfaceOp.py → .../IECore/MeshPrimitiveImplicitSurfaceOp.py b/.../IECore/MeshPrimitiveImplicitSurfaceOp.py → .../IECore/MeshPrimitiveImplicitSurfaceOp.py
diff --git a/...citSurfaces/test/IECore/ParticleMeshOp.py → ...citSurfaces/test/IECore/ParticleMeshOp.py b/...citSurfaces/test/IECore/ParticleMeshOp.py → ...citSurfaces/test/IECore/ParticleMeshOp.py
diff --git a/...plicitSurfaces/test/IECore/PointMeshOp.py → ...plicitSurfaces/test/IECore/PointMeshOp.py b/...plicitSurfaces/test/IECore/PointMeshOp.py → ...plicitSurfaces/test/IECore/PointMeshOp.py
diff --git a/...ECore/PrimitiveImplicitSurfaceFunction.py → ...ECore/PrimitiveImplicitSurfaceFunction.py b/...ECore/PrimitiveImplicitSurfaceFunction.py → ...ECore/PrimitiveImplicitSurfaceFunction.py
diff --git a/cortex-9.0.0-a6/doc/config/Doxyfile → cortex-9.0.0-a10/doc/config/Doxyfile b/cortex-9.0.0-a6/doc/config/Doxyfile → cortex-9.0.0-a10/doc/config/Doxyfile
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/ColorAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/ColorAlgo.h b/cortex-9.0.0-a6/glsl/IECoreGL/ColorAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/ColorAlgo.h
diff --git a/...-9.0.0-a6/glsl/IECoreGL/CurvesPrimitive.h → ...9.0.0-a10/glsl/IECoreGL/CurvesPrimitive.h b/...-9.0.0-a6/glsl/IECoreGL/CurvesPrimitive.h → ...9.0.0-a10/glsl/IECoreGL/CurvesPrimitive.h
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/Diffuse.h → cortex-9.0.0-a10/glsl/IECoreGL/Diffuse.h b/cortex-9.0.0-a6/glsl/IECoreGL/Diffuse.h → 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<nLights; i++ )
 	{
-		result += Cl[i] * max( 0.0, dot( N, normalize( L[i] ) ) );
+		result += Cl[i] * normalization * max( 0.0, dot( N, normalize( L[i] ) ) );
 	}
 	return result;
 }

diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/FilterAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/FilterAlgo.h b/cortex-9.0.0-a6/glsl/IECoreGL/FilterAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/FilterAlgo.h
diff --git a/...x-9.0.0-a6/glsl/IECoreGL/FragmentShader.h → ...-9.0.0-a10/glsl/IECoreGL/FragmentShader.h b/...x-9.0.0-a6/glsl/IECoreGL/FragmentShader.h → ...-9.0.0-a10/glsl/IECoreGL/FragmentShader.h
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/Light.h → cortex-9.0.0-a10/glsl/IECoreGL/Light.h b/cortex-9.0.0-a6/glsl/IECoreGL/Light.h → cortex-9.0.0-a10/glsl/IECoreGL/Light.h
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/Lights.h → cortex-9.0.0-a10/glsl/IECoreGL/Lights.h b/cortex-9.0.0-a6/glsl/IECoreGL/Lights.h → cortex-9.0.0-a10/glsl/IECoreGL/Lights.h
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/MatrixAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/MatrixAlgo.h b/cortex-9.0.0-a6/glsl/IECoreGL/MatrixAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/MatrixAlgo.h
diff --git a/...-9.0.0-a6/glsl/IECoreGL/PointsPrimitive.h → ...9.0.0-a10/glsl/IECoreGL/PointsPrimitive.h b/...-9.0.0-a6/glsl/IECoreGL/PointsPrimitive.h → ...9.0.0-a10/glsl/IECoreGL/PointsPrimitive.h
diff --git a/...ex-9.0.0-a6/src/IECoreGL/TextureUnits.cpp → cortex-9.0.0-a10/glsl/IECoreGL/Specular.h b/...ex-9.0.0-a6/src/IECoreGL/TextureUnits.cpp → cortex-9.0.0-a10/glsl/IECoreGL/Specular.h
@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2007, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2007-2010, 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,48 +32,44 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-#include "IECoreGL/TextureUnits.h"
+#ifndef IECOREGL_SPECULAR_H
+#define IECOREGL_SPECULAR_H
 
-const std::vector<GLenum> &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<GLenum> 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<nLights; i++ )
 	{
-		t.push_back( GL_TEXTURE0 );
-		t.push_back( GL_TEXTURE1 );
-		t.push_back( GL_TEXTURE2 );
-		t.push_back( GL_TEXTURE3 );
-		t.push_back( GL_TEXTURE4 );
-		t.push_back( GL_TEXTURE5 );
-		t.push_back( GL_TEXTURE6 );
-		t.push_back( GL_TEXTURE7 );
-		t.push_back( GL_TEXTURE8 );
-		t.push_back( GL_TEXTURE9 );
-		t.push_back( GL_TEXTURE10 );
-		t.push_back( GL_TEXTURE11 );
-		t.push_back( GL_TEXTURE12 );
-		t.push_back( GL_TEXTURE13 );
-		t.push_back( GL_TEXTURE14 );
-		t.push_back( GL_TEXTURE15 );
-		t.push_back( GL_TEXTURE16 );
-		t.push_back( GL_TEXTURE17 );
-		t.push_back( GL_TEXTURE18 );
-		t.push_back( GL_TEXTURE19 );
-		t.push_back( GL_TEXTURE20 );
-		t.push_back( GL_TEXTURE21 );
-		t.push_back( GL_TEXTURE22 );
-		t.push_back( GL_TEXTURE23 );
-		t.push_back( GL_TEXTURE24 );
-		t.push_back( GL_TEXTURE25 );
-		t.push_back( GL_TEXTURE26 );
-		t.push_back( GL_TEXTURE27 );
-		t.push_back( GL_TEXTURE28 );
-		t.push_back( GL_TEXTURE29 );
-		t.push_back( GL_TEXTURE30 );
-		t.push_back( GL_TEXTURE31 );
-		GLint max = 0;
-		glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max );
-		t.resize( max );
+		vec3 L = normalize( lightDirs[i] );
+		vec3 H = normalize( L + V );
+
+		// Light Component of G : The shadowing term
+		float G1L = max( 0, dot( N, L ) ) / ( dot( N, L ) * ( 1 - k ) + k );
+
+		// Blinn microfacet distribution
+		float D = pow( max( 0.0, dot( N, H ) ), n ) * normalization;
+		result += lightColors[i] * D * G1L * G1V;
 	}
-	return t;
+	return result;
 }
+
+#endif // IECOREGL_SPECULAR_H
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/VecAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/VecAlgo.h b/cortex-9.0.0-a6/glsl/IECoreGL/VecAlgo.h → cortex-9.0.0-a10/glsl/IECoreGL/VecAlgo.h
diff --git a/cortex-9.0.0-a6/glsl/IECoreGL/VertexShader.h → ...ex-9.0.0-a10/glsl/IECoreGL/VertexShader.h b/cortex-9.0.0-a6/glsl/IECoreGL/VertexShader.h → ...ex-9.0.0-a10/glsl/IECoreGL/VertexShader.h
diff --git a/cortex-9.0.0-a6/glsl/ieConstant.frag → cortex-9.0.0-a10/glsl/ieConstant.frag b/cortex-9.0.0-a6/glsl/ieConstant.frag → cortex-9.0.0-a10/glsl/ieConstant.frag
diff --git a/cortex-9.0.0-a6/glsl/ieConstant.vert → cortex-9.0.0-a10/glsl/ieConstant.vert b/cortex-9.0.0-a6/glsl/ieConstant.vert → cortex-9.0.0-a10/glsl/ieConstant.vert
diff --git a/cortex-9.0.0-a6/glsl/ieMarschnerHair.frag → cortex-9.0.0-a10/glsl/ieMarschnerHair.frag b/cortex-9.0.0-a6/glsl/ieMarschnerHair.frag → cortex-9.0.0-a10/glsl/ieMarschnerHair.frag
diff --git a/cortex-9.0.0-a6/glsl/ieMarschnerHair.vert → cortex-9.0.0-a10/glsl/ieMarschnerHair.vert b/cortex-9.0.0-a6/glsl/ieMarschnerHair.vert → cortex-9.0.0-a10/glsl/ieMarschnerHair.vert
diff --git a/cortex-9.0.0-a6/graphics/CortexLogo.svg → cortex-9.0.0-a10/graphics/CortexLogo.svg b/cortex-9.0.0-a6/graphics/CortexLogo.svg → cortex-9.0.0-a10/graphics/CortexLogo.svg
diff --git a/cortex-9.0.0-a6/graphics/CortexLogoMini.svg → cortex-9.0.0-a10/graphics/CortexLogoMini.svg b/cortex-9.0.0-a6/graphics/CortexLogoMini.svg → cortex-9.0.0-a10/graphics/CortexLogoMini.svg
diff --git a/cortex-9.0.0-a6/graphics/icons.svg → cortex-9.0.0-a10/graphics/icons.svg b/cortex-9.0.0-a6/graphics/icons.svg → cortex-9.0.0-a10/graphics/icons.svg
diff --git a/...s/IECoreHoudini/SOP_ieCortexConverter.svg → ...s/IECoreHoudini/SOP_ieCortexConverter.svg b/...s/IECoreHoudini/SOP_ieCortexConverter.svg → ...s/IECoreHoudini/SOP_ieCortexConverter.svg
diff --git a/...Houdini/SOP_ieInterpolatedCacheReader.svg → ...Houdini/SOP_ieInterpolatedCacheReader.svg b/...Houdini/SOP_ieInterpolatedCacheReader.svg → ...Houdini/SOP_ieInterpolatedCacheReader.svg
diff --git a/...a6/icons/IECoreHoudini/SOP_ieOpHolder.svg → ...10/icons/IECoreHoudini/SOP_ieOpHolder.svg b/...a6/icons/IECoreHoudini/SOP_ieOpHolder.svg → ...10/icons/IECoreHoudini/SOP_ieOpHolder.svg
diff --git a/.../IECoreHoudini/SOP_ieProceduralHolder.svg → .../IECoreHoudini/SOP_ieProceduralHolder.svg b/.../IECoreHoudini/SOP_ieProceduralHolder.svg → .../IECoreHoudini/SOP_ieProceduralHolder.svg