Merge pull request #280 from andrewkaufman/visibileCrash

Fixing crash in SceneCache ROP todo with "scene:visible" attribute

Author: andrewkaufman

include/IECore/SceneInterface.h

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2013-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
@@ -93,7 +93,7 @@ class SceneInterface : public RunTimeTyped
 		/// Utility variable that can be used anytime you want to refer to the root path in the Scene.
 		static const Path &rootPath;
 		/// Name of the visibility attribute
-		static const Name visibilityName;
+		static const Name &visibilityName;
 
 		/// Create an instance of a subclass which is able to open the file found at "path".
 		/// Files can be opened for Read, Write, or Append depending on the derived classes.

include/IECoreHoudini/ROP_SceneCacheWriter.h

@@ -79,7 +79,7 @@ class ROP_SceneCacheWriter : public ROP_Node
 
 	private :
 
-		static const IECore::SceneInterface::Name &visibleAttribute;
+		static const IECore::SceneInterface::Name &changingHierarchyAttribute;
 
 		bool linked( const std::string &file ) const;
 

src/IECore/SceneInterface.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2013-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
@@ -42,7 +42,7 @@ IE_CORE_DEFINERUNTIMETYPEDDESCRIPTION( SceneInterface )
 
 const SceneInterface::Name &SceneInterface::rootName = IndexedIO::rootName;
 const SceneInterface::Path &SceneInterface::rootPath = IndexedIO::rootPath;
-const SceneInterface::Name SceneInterface::visibilityName( "scene:visible" );
+const SceneInterface::Name &SceneInterface::visibilityName( "scene:visible" );
 
 class SceneInterface::CreatorMap : public std::map< std::pair< std::string, IndexedIO::OpenModeFlags >, CreatorFn>
 {

src/IECoreHoudini/ROP_SceneCacheWriter.cpp

@@ -79,7 +79,7 @@ PRM_Default ROP_SceneCacheWriter::fileDefault( 0, "$HIP/output.scc" );
 PRM_Default ROP_SceneCacheWriter::rootObjectDefault( 0, "/obj" );
 PRM_SpareData ROP_SceneCacheWriter::forceObjectsSpareData;
 
-const SceneInterface::Name &ROP_SceneCacheWriter::visibleAttribute( "scene:visible" );
+const SceneInterface::Name &ROP_SceneCacheWriter::changingHierarchyAttribute( "sceneInterface:changingHierarchy" );
 
 OP_TemplatePair *ROP_SceneCacheWriter::buildParameters()
 {
@@ -387,13 +387,14 @@ ROP_RENDER_CODE ROP_SceneCacheWriter::doWrite( const SceneInterface *liveScene,
 
 			if ( time != m_startTime )
 			{
-				outChild->writeAttribute( visibleAttribute, new BoolData( false ), time - 1e-6 );
+				outChild->writeAttribute( changingHierarchyAttribute, new BoolData( true ), time );
+				outChild->writeAttribute( IECore::SceneInterface::visibilityName, new BoolData( false ), time - 1e-6 );
 			}
 		}
 
-		if ( outChild->hasAttribute( visibleAttribute ) )
+		if ( outChild->hasAttribute( changingHierarchyAttribute ) )
 		{
-			outChild->writeAttribute( visibleAttribute, new BoolData( true ), time );
+			outChild->writeAttribute( IECore::SceneInterface::visibilityName, new BoolData( true ), time );
 		}
 
 		ROP_RENDER_CODE status = doWrite( liveChild, outChild, time, progress );
@@ -403,20 +404,21 @@ ROP_RENDER_CODE ROP_SceneCacheWriter::doWrite( const SceneInterface *liveScene,
 		}
 	}
 
-	// turn visibleAttribute off if the child disappears
+	// turn visibility off if the child disappears
 	SceneInterface::NameList outChildren;
 	outScene->childNames( outChildren );
 	for ( SceneInterface::NameList::iterator it = outChildren.begin(); it != outChildren.end(); ++it )
 	{
 		if ( !liveScene->hasChild( *it ) )
 		{
 			SceneInterfacePtr outChild = outScene->child( *it );
-			if ( !outChild->hasAttribute( visibleAttribute ) )
+			if ( !outChild->hasAttribute( IECore::SceneInterface::visibilityName ) )
 			{
-				outChild->writeAttribute( visibleAttribute, new BoolData( true ), time - 1e-6 );
+				outChild->writeAttribute( IECore::SceneInterface::visibilityName, new BoolData( true ), time - 1e-6 );
 			}
 
-			outChild->writeAttribute( visibleAttribute, new BoolData( false ), time );
+			outChild->writeAttribute( changingHierarchyAttribute, new BoolData( true ), time );
+			outChild->writeAttribute( IECore::SceneInterface::visibilityName, new BoolData( false ), time );
 		}
 	}
 

src/IECorePython/SceneInterfaceBinding.cpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
+//  Copyright (c) 2013-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
@@ -268,7 +268,7 @@ void bindSceneInterface()
 		.def( "create", SceneInterface::create ).staticmethod( "create" )
 		.def( "supportedExtensions", supportedExtensions, ( arg("modes") = IndexedIO::Read|IndexedIO::Write|IndexedIO::Append ) ).staticmethod( "supportedExtensions" )
 
-		.add_static_property( "visibilityName", make_getter(&SceneInterface::visibilityName, return_value_policy<reference_existing_object>() ) )
+		.def_readonly("visibilityName", &SceneInterface::visibilityName )
 	;
 }