Bugfixes for scene conversion, make sure cameras don't try to convert to a mesh. Also the last build wasn't changing devices properly.

Author: boberfly

build_docker.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python build.py --version 0.5.1 --cyclesVersion 0.5.0 --docker 1 --upload 0 $@
+python build.py --version 0.5.2 --cyclesVersion 0.5.0 --docker 1 --upload 0 $@

build_linux_osx.sh

@@ -8,7 +8,7 @@ if [[ -z "${GAFFER_ROOT}" ]]; then
 fi
 
 # Packaging variables
-VERSION=0.5.1
+VERSION=0.5.2
 GAFFERVERSION=0.53.4.0
 
 if [[ -z "${GAFFER_BUILD_TYPE}" ]]; then

build_ubuntu.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-python build.py --version 0.5.1 --cyclesVersion 0.5.0 --forceCxxCompiler g++-6 --docker false
+python build.py --version 0.5.2 --cyclesVersion 0.5.0 --forceCxxCompiler g++-6 --docker false

src/GafferCycles/IECoreCyclesPreview/CameraAlgo.cpp

@@ -33,7 +33,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "GafferCycles/IECoreCyclesPreview/CameraAlgo.h"
-
+#include "GafferCycles/IECoreCyclesPreview/ObjectAlgo.h"
 #include "GafferCycles/IECoreCyclesPreview/SocketAlgo.h"
 
 #include "IECoreScene/Camera.h"
@@ -54,6 +54,7 @@ namespace
 
 ccl::Camera *convertCommon( const IECoreScene::Camera *camera, const std::string &nodeName )
 {
+	assert( camera->typeId() == IECoreScene::Camera::staticTypeId() );
 	ccl::Camera *ccam = new ccl::Camera();
 	ccam->name = ccl::ustring(nodeName.c_str());
 

src/GafferCycles/IECoreCyclesPreview/CurvesAlgo.cpp

@@ -56,6 +56,7 @@ namespace
 
 ccl::Mesh *convertCommon( const IECoreScene::CurvesPrimitive *curve )
 {
+	assert( curve->typeId() == IECoreScene::CurvesPrimitive::staticTypeId() );
 	ccl::Mesh *cmesh = new ccl::Mesh();
 
 	size_t numCurves = curve->numCurves();

src/GafferCycles/IECoreCyclesPreview/MeshAlgo.cpp

@@ -118,6 +118,7 @@ void convertUVSet( const string &uvSet, const IECoreScene::PrimitiveVariable &uv
 
 ccl::Mesh *convertCommon( const IECoreScene::MeshPrimitive *mesh )
 {
+	assert( mesh->typeId() == IECoreScene::MeshPrimitive::staticTypeId() );
 	ccl::Mesh *cmesh = new ccl::Mesh();
 
 	const size_t numFaces = mesh->numFaces();

src/GafferCycles/IECoreCyclesPreview/Renderer.cpp

@@ -1793,7 +1793,8 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 				m_session( nullptr ),
 				m_scene( nullptr ),
 				m_renderCallback( nullptr ),
-				m_rendering( false )
+				m_rendering( false ),
+				m_deviceDirty( false )
 		{
 			// Set path to find shaders
 			ccl::path_init( getenv("GAFFERCYCLES") );
@@ -1967,20 +1968,21 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 			}
 			else if( name == g_deviceOptionName )
 			{
-				if( const StringData *data = reportedCast<const StringData>( value, "option", name ) )
+				if( value == nullptr )
 				{
-					auto device_name = data->readable();
-					m_deviceName = device_name;
+					m_deviceName = "CPU";
 				}
-				else if( value == nullptr )
+				else if( const StringData *data = reportedCast<const StringData>( value, "option", name ) )
 				{
-					m_deviceName = "CPU";
+					auto device_name = data->readable();
+					m_deviceName = device_name;
 				}
 				else
 				{
 					m_deviceName = "CPU";
 					IECore::msg( IECore::Msg::Warning, "CyclesRenderer::option", boost::format( "Unknown value \"%s\" for option \"%s\"." ) % m_deviceName % name.string() );
 				}
+				m_deviceDirty = true;
 				return;
 			}
 			else if( name == g_shadingsystemOptionName )
@@ -2396,6 +2398,10 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 
 		ObjectInterfacePtr object( const std::string &name, const IECore::Object *object, const AttributesInterface *attributes ) override
 		{
+			if( object->typeId() == IECoreScene::Camera::staticTypeId() )
+			{
+				return nullptr;
+			}
 			Instance instance = m_instanceCache->get( object, name );
 
 			ObjectInterfacePtr result = new CyclesObject( instance );
@@ -2405,6 +2411,10 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 
 		ObjectInterfacePtr object( const std::string &name, const std::vector<const IECore::Object *> &samples, const std::vector<float> &times, const AttributesInterface *attributes ) override
 		{
+			if( samples.front()->typeId() == IECoreScene::Camera::staticTypeId() )
+			{
+				return nullptr;
+			}
 			Instance instance = m_instanceCache->get( samples, times, name );
 
 			ObjectInterfacePtr result = new CyclesObject( instance );
@@ -2571,8 +2581,10 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 			m_sessionParams.denoising = m_denoiseParams;
 			// If anything changes in scene or session, we reset.
 			if( m_scene->params.modified( m_sceneParams ) ||
-			    m_session->params.modified( m_sessionParams ) )
+			    m_session->params.modified( m_sessionParams ) ||
+				m_deviceDirty )
 			{
+				m_deviceDirty = false;
 				reset();
 			}
 
@@ -2785,6 +2797,7 @@ class CyclesRenderer final : public IECoreScenePreview::Renderer
 		int m_frame;
 		string m_camera;
 		bool m_rendering;
+		bool m_deviceDirty;
 
 		// Caches.
 		CameraCachePtr m_cameraCache;