Updated Cortex to 9.0.0.

build/buildCortex.sh

@@ -5,7 +5,7 @@ set -e
 mkdir -p $BUILD_DIR/resources/cortex
 cp `dirname $0`/../tileset_2048.dat $BUILD_DIR/resources/cortex
 
-cd `dirname $0`/../cortex-9.0.0-b6
+cd `dirname $0`/../cortex-9.0.0
 
 mkdir -p $BUILD_DIR/doc/licenses
 cp LICENSE $BUILD_DIR/doc/licenses/cortex

cortex-9.0.0-b6/.gitignore → cortex-9.0.0/.gitignore

@@ -20,11 +20,13 @@ lib
 build
 config.log
 mayaLog
+projects
 test/IECore/IECoreTest
 test/IECore/results.txt
 test/IECore/resultsPython.txt
 test/IECoreRI/resultsPython.txt
 test/IECoreMaya/resultsPython.txt
 test/IECoreNuke/resultsPython.txt
 test/IECoreHoudini/resultsPython.txt
+contrib/IECoreMantra/test/IECoreMantra/results.txt
 /.ubuntu

cortex-9.0.0/.travis.yml

@@ -0,0 +1,24 @@
+sudo: false
+
+language: cpp
+
+os:
+    - linux
+
+addons:
+  apt:
+    packages:
+    - libboost-all-dev
+    - libopenexr-dev
+    - libtbb-dev
+    - libfreetype6-dev
+
+script:
+    - scons -j 2 testCore testCorePython CXX=$CXX ENV_VARS_TO_IMPORT="PATH TRAVIS" RMAN_ROOT=$DELIGHT BOOST_LIB_SUFFIX=""
+
+compiler:
+    ## \todo Enable clang here too. We can't with the default Ubuntu boost
+    # install though, because it is broken for Clang :
+    #
+    # https://svn.boost.org/trac/boost/ticket/6156
+    - gcc

cortex-9.0.0-b6/Changes → cortex-9.0.0/Changes

@@ -1,3 +1,97 @@
+# 9.0.0
+
+#### IECore
+
+- Renamed GeometricData::Interpretation::Numeric to GeometricData::Interpretation::None, so that it makes sense as a deafult for non-numeric types.
+  - GeometricData::Interpretation::Numeric still exists for compatibility.
+- Added DataAlgo.h with setDataInterpretation() and getDataInterpretation().
+
+#### IECoreMaya
+
+- FromMayaCameraConverter now accounts for pixelAspectRatio.
+
+#### IECoreRI
+
+- Primitive variable types in RI now set from the prim var interpretation.  Type hints now ignored.
+
+#### IECoreAppleseed
+
+- Added support for shading overrides.
+- Added mesh tangents and motion normals.
+  - Mesh tangents (primitive variable uTangent) are now exported to appleseed meshes.
+  - Time varying tangents and normals for primitives with deformation blur are now exported if appleseed supports them (since version 1.2.0).
+- Fixed a warning message in ToAppleseedMeshConverter.
+
+#### Build
+
+- Travis : Updated to container-based build infrastructure.
+- Travis : Skipped some threading tests on Travis.
+
+# 9.0.0-b9
+
+#### IECore
+
+- Fixed shutdown crashes with ScopedGILLock (as seen in Gaffer 0.14.0.0)
+
+# 9.0.0-b8
+
+#### IECore
+
+- Added a new magic number for JPG compatibility
+
+#### IECoreMaya
+
+- Maya 2016 compile fixes for gcc 4.8
+
+#### IECoreAlembic
+
+- Fixed bug where face sets were treated as children.
+
+#### IECoreRI
+
+- Changed SXExecutor parameter interpretation.
+
+#### IECoreAppleseed
+
+- Added support for interactive non-editable final rendering.
+
+# 9.0.0-b7
+
+#### IECore
+
+- Storing the bounding box in .cob headers if the object is a VisibleRenderable.
+- TransformOp now takes a copy of the data before altering it.
+- GCC 4.8 compatibility.
+- Boost 1.55.0 compatibility.
+- TBB 4.3 compatibility.
+
+#### IECoreMaya
+
+- Fixed FromMayaCameraConverter to account for non-zero film offsets.
+- ToMayaCameraConverter now supports setting the film offset using blindData on the Camera.
+- Maya 2016 compatibility.
+
+#### IECoreHoudini
+
+- Fixed issue exporting string attributes when Houdini reports an extra null string in the detail.
+- Added support for converting quaternions to and from Houdini.
+- Houdini 14 compatibility.
+
+#### IECoreRI
+
+- SLOReader sets geometric interpretation on parameters.
+- ParameterList makes use of geometric interpretation when available.
+
+#### IECoreAppleseed
+
+- Fixed appleseed error while binding inputs of object instances.
+- Various options changes:
+  - Set decorrelate_pixels automatically depending on render passes.
+  - If the rendering_threads option is zero, use all CPU cores for rendering.
+  - If the as:cfg:pt:max_ray_intensity is zero, disable max intensity clamping.
+  - Disable max number of bounces for max_path_length options set to zero.
+  - Check the type of the Data passed to setOption before accessing it.
+
 # 9.0.0-b6
 
 #### IECore

cortex-9.0.0-b6/SConstruct → cortex-9.0.0/SConstruct

@@ -53,7 +53,7 @@ SConsignFile()
 ieCoreMajorVersion=9
 ieCoreMinorVersion=0
 ieCorePatchVersion=0
-ieCoreVersionSuffix="b6"	# used for alpha/beta releases. Example: "a1", "b2", etc.
+ieCoreVersionSuffix=""	# used for alpha/beta releases. Example: "a1", "b2", etc.
 
 ###########################################################################################
 # Command line options
@@ -994,7 +994,7 @@ o.Add(
 o.Add(
 	"DOXYGEN",
 	"The path to the doxygen binary.",
-	"/usr/local/bin/doxygen"
+	"doxygen"
 )
 
 ###########################################################################################
@@ -1135,6 +1135,9 @@ if doConfigure :
 	if int( env["BOOST_MINOR_VERSION"] ) >=35 :
 		env.Append( LIBS = [ "boost_system" + env["BOOST_LIB_SUFFIX"] ] )
 
+	if int( env["BOOST_MINOR_VERSION"] ) >=55 :
+		env.Append( CXXFLAGS = [ "-DBOOST_SIGNALS_NO_DEPRECATION_WARNING" ] )
+
 	if not c.CheckLibWithHeader( env.subst( "boost_iostreams" + env["BOOST_LIB_SUFFIX"] ), "boost/iostreams/chain.hpp", "CXX" ) :
 		sys.stderr.write( "ERROR : unable to find the boost libraries - check BOOST_LIB_PATH.\n" )
 		Exit( 1 )
@@ -1682,15 +1685,15 @@ if doConfigure :
 			riPythonSources.remove( "src/IECoreRI/bindings/PTCParticleReaderBinding.cpp" )
 			riPythonSources.remove( "src/IECoreRI/bindings/PTCParticleWriterBinding.cpp" )
 
-		if c.CheckFunc( "RiObjectBeginV" ) :
+		if c.CheckFunc( "RiObjectBeginV", language="CXX" ) :
 
 			riEnv.Append( CPPFLAGS = [ "-DIECORERI_WITH_OBJECTBEGINV" ] )
 
-		if c.CheckFunc( "RiProceduralV" ) :
+		if c.CheckFunc( "RiProceduralV", language="CXX" ) :
 
 			riEnv.Append( CPPFLAGS = [ "-DIECORERI_WITH_PROCEDURALV" ] )
 
-		if haveDelight and c.CheckCXXHeader( "sx.h" ) and c.CheckFunc( "SxGetParameter" ) :
+		if haveDelight and c.CheckCXXHeader( "sx.h" ) and c.CheckFunc( "SxGetParameter", language="CXX" ) :
 
 			riEnv.Append( CPPFLAGS = "-DIECORERI_WITH_SX" )
 			riPythonModuleEnv.Append( CPPFLAGS = "-DIECORERI_WITH_SX" )
@@ -1706,7 +1709,7 @@ if doConfigure :
 
 				sys.stderr.write( "WARNING : Supported Sx API version not found - not building SXRenderer. Use 3delight 9.0.36 or later.\n" )
 
-		if haveDelight and c.CheckCXXHeader( "gx.h" ) and c.CheckFunc( "GxGetGeometry" ) :
+		if haveDelight and c.CheckCXXHeader( "gx.h" ) and c.CheckFunc( "GxGetGeometry", language="CXX" ) :
 
 			riEnv.Append( CPPFLAGS = "-DIECORERI_WITH_GX" )
 			riPythonModuleEnv.Append( CPPFLAGS = "-DIECORERI_WITH_GX" )
@@ -2477,6 +2480,9 @@ if env["PLATFORM"] == "posix" :
 houdiniPluginEnv = houdiniEnv.Clone( IECORE_NAME="ieCoreHoudini" )
 
 mantraEnv = houdiniEnv.Clone( IECORE_NAME="IECoreMantra")
+## \todo: This is a stopgap measure to get IECoreMantra building for Houdini 14.
+# We should come back and address the deprecations appropriately.
+mantraEnv.Append( CXXFLAGS = [ "-Wno-deprecated-declarations" ] )
 mantraPythonModuleEnv = houdiniPythonModuleEnv.Clone( IECORE_NAME="IECoreMantra" )
 mantraProceduralEnv =  houdiniEnv.Clone( IECORE_NAME="VRAY_ieProcedural" )
 mantraWorldEnv =  houdiniEnv.Clone( IECORE_NAME="VRAY_ieWorld" )
@@ -3295,7 +3301,7 @@ if doConfigure :
 
 	sys.stdout.write( "Checking for doxygen... " )
 
-	if os.path.exists( docEnv["DOXYGEN"] ) :
+	if docEnv.WhereIs( docEnv["DOXYGEN"] ) :
 
 		sys.stdout.write( "yes\n" )
 

cortex-9.0.0-b6/config/ie/buildAll → cortex-9.0.0/config/ie/buildAll

@@ -52,25 +52,25 @@ def installDocs() :
 
 		raise RuntimeError("Error : scons installDoc " + str( " ".join( buildArgs ) ) )
 
-if IEEnv.platform() == "cent6.x86_64" :
+if IEEnv.platform() in ( "cent6.x86_64", "cent7.x86_64" ) :
 
 	for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]): 
 		for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
 			build( [ "COMPILER_VERSION="+compilerVersion, "DL_VERSION=UNDEFINED", "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=4.0.9.1" ] )
 
 	for dlVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["3delight"] ):
-		for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
-			build( [ "COMPILER_VERSION=4.1.2", "DL_VERSION="+dlVersion, "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=UNDEFINED" ] )
+		for compilerVersion in IEEnv.activeVersions(IEEnv.registry["compilers"]["gcc"]): 
+			for pythonVersion in IEEnv.activeVersions( IEEnv.registry["apps"]["python"] ) :
+				build( [ "COMPILER_VERSION="+compilerVersion, "DL_VERSION="+dlVersion, "PYTHON_VERSION="+pythonVersion, "ARNOLD_VERSION=UNDEFINED" ] )
 
 	for mayaVersion in IEEnv.activeAppVersions( "maya" ) :
-		build( [ "APP=maya", "APP_VERSION="+mayaVersion, "DL_VERSION=10.0.142", "ARNOLD_VERSION=4.0.9.1" ] )
+		build( [ "APP=maya", "APP_VERSION="+mayaVersion ] )
 
 	for nukeVersion in IEEnv.activeAppVersions( "nuke" ) :
-		if nukeVersion.startswith( "8" ) :
-			build( [ "APP=nuke", "APP_VERSION="+nukeVersion ] )
+		build( [ "APP=nuke", "APP_VERSION="+nukeVersion ] )
 
 	for houdiniVersion in IEEnv.activeAppVersions( "houdini" ) :
-		if houdiniVersion.endswith( "-python2.7" ) :
+		if houdiniVersion.startswith( "14" ) or ( houdiniVersion.startswith( "13" ) and houdiniVersion.endswith( "-python2.7" ) ) :
 			build( [ "APP=houdini", "APP_VERSION="+houdiniVersion ] )
 
 	installDocs()

cortex-9.0.0-b6/config/ie/options → cortex-9.0.0/config/ie/options

@@ -65,7 +65,6 @@ targetApp = getOption( "APP", None )
 # fall back to the generic settings for this major version.
 cortexReg = IEEnv.registry["libraries"]["cortex"]["9"].get( platform, IEEnv.registry["libraries"]["cortex"]["9"] )
 
-tbbVersion = cortexReg["tbbVersion"]
 if targetApp :
 
 	if targetApp not in ( "nuke", "maya", "houdini" ) :
@@ -88,6 +87,7 @@ if targetApp :
 	glewVersion = targetAppReg.get( "glewVersion", cortexReg["glewVersion"] )
 	pythonVersion = targetAppReg["pythonVersion"]
 	boostVersion = targetAppReg.get( "boostVersion", cortexReg["boostVersion"] )
+	tbbVersion = targetAppReg.get( "tbbVersion", cortexReg["tbbVersion"] )
 	targetAppMajorVersion = targetAppReg.get( "majorVersion", targetAppVersion )
 else :
 	platformReg = IEEnv.registry["platformDefaults"][IEEnv.platform()]
@@ -176,25 +176,28 @@ if compilerVersionInt < 350 :
 	##########################################################################################################
 	LINKFLAGS += [ "-Wl,--noinhibit-exec" ]
 
-# find tbb
+
+# set the dependency paths
 TBB_INCLUDE_PATH = os.path.join( "/software/apps/tbb", tbbVersion, platform, compiler, compilerVersion, "include" )
 TBB_LIB_PATH = os.path.join( "/software/apps/tbb", tbbVersion, platform, compiler, compilerVersion, "lib" )
-
-# set the include paths
 BOOST_INCLUDE_PATH = os.path.join( "/software/tools/include", platform, "boost", boostVersion )
+BOOST_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
 OPENEXR_INCLUDE_PATH = "/software/tools/include/" + platform + "/OpenEXR/" + openEXRVersion
+OPENEXR_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
+ILMBASE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
 GLEW_INCLUDE_PATH = "/software/tools/include/" + platform + "/glew/" + glewVersion + "/GL"
+GLEW_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
 GLEW_LIB_SUFFIX = "-" + glewVersion
 
+PNG_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
+JPEG_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
+TIFF_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
+FREETYPE_LIB_PATH = os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion )
+
+# we use the /usr/lib64 versions of tiff, png, freetype and jpeg
+# with the exception of freetype on CentOS 6.
 if platform == "cent6.x86_64" :
-	# use the /usr/lib versions of tiff, png, freetype and jpeg
 	FREETYPE_INCLUDE_PATH = "/usr/include/freetype2"
-else :
-	TIFF_INCLUDE_PATH = "/software/tools/include/tiff/3.8.2"
-	JPEG_INCLUDE_PATH = "/software/tools/include/jpeg/6b"
-	FREETYPE_INCLUDE_PATH = "/software/tools/include/freetype/2.3.5/freetype2"
-	PNG_INCLUDE_PATH = "/software/tools/include/png/1.5.2"
-	CXXFLAGS += [ "-isystem", "/software/tools/include/freetype/2.3.5" ]
 
 # figure out the boost lib suffix
 compilerVersionSplit = compilerVersion.split( "." )
@@ -206,7 +209,10 @@ else:
 OPENEXR_LIB_SUFFIX = "-" + openEXRVersion
 
 # find the right libraries based on compiler and platform
-LIBPATH = "/software/tools/lib/" + platform + "/" + compiler + "/" + compilerVersion
+LIBPATH = ":".join( [
+	os.path.join( "/software", "tools", "lib", platform, compiler, compilerVersion ),
+	os.path.join( "/software", "apps", compiler, compilerVersion, platform, "lib64" ),
+] )
 if targetApp :
 	## \todo: the final or in this statement is for Nuke. Remove once the Nuke registry has been updated to use libPaths
 	libPaths = [ os.path.join( targetAppReg["location"], x ) for x in targetAppReg.get( "libPaths", [] ) ] or [ targetAppReg["location"] ]
@@ -323,7 +329,9 @@ if targetApp=="houdini" :
 
 	houdiniReg = IEEnv.registry["apps"]["houdini"][houdiniVersion][platform]
 	BOOST_INCLUDE_PATH = "/software/tools/include/" + platform + "/boost/" + boostVersion
-	PNG_INCLUDE_PATH = os.path.join( houdiniReg['location'], houdiniReg['includes'][0] )
+
+	if "pngVersion" in houdiniReg :
+		PNG_INCLUDE_PATH = "/software/tools/include/" + platform + "/png/" + houdiniReg["pngVersion"]
 
 	HOUDINI_ROOT = houdiniReg['location']
 	HOUDINI_CXX_FLAGS = " ".join( CXXFLAGS ) + ' -DVERSION=\"'+houdiniVersion+'\" -DDLLEXPORT=  -D_GNU_SOURCE -DLINUX -DAMD64 -m64 -fPIC -DSIZEOF_VOID_P=8 -DSESI_LITTLE_ENDIAN -DENABLE_THREADS -DUSE_PTHREADS -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DGCC4 -DGCC3 -Wno-deprecated -Wno-reorder'

cortex-9.0.0-b6/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h → cortex-9.0.0/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h

@@ -54,7 +54,7 @@ struct IGeomParamTraits
 
 	static IECore::GeometricData::Interpretation geometricInterpretation()
 	{
-		return IECore::GeometricData::Numeric;
+		return IECore::GeometricData::None;
 	}
 
 };

cortex-9.0.0-b6/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp → cortex-9.0.0/contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp

@@ -402,6 +402,19 @@ IECore::ObjectPtr AlembicInput::objectAtTime( double time, IECore::TypeId result
 
 size_t AlembicInput::numChildren() const
 {
+	if(
+		!IXform::matches( m_data->object.getMetaData() ) &&
+		m_data->object.getParent()
+	)
+	{
+		// not a transform, and not the top of the archive.
+		// we want to ignore any children, because they won't
+		// be something we consider part of the hierarchy -
+		// alembic implements face sets as objects parented to
+		// a mesh for instance, whereas we would just think
+		// of them as a property of the mesh.
+		return 0;
+	}
 	return m_data->object.getNumChildren();
 }
 
@@ -421,7 +434,7 @@ IECore::StringVectorDataPtr AlembicInput::childNames() const
 {
 	StringVectorDataPtr resultData = new StringVectorData;
 	std::vector<std::string> &resultVector = resultData->writable();
-	size_t numChildren = m_data->object.getNumChildren();
+	size_t numChildren = this->numChildren();
 	for( size_t i=0; i<numChildren; i++ )
 	{
 		resultVector.push_back( m_data->object.getChildHeader( i ).getName() );