Merge pull request #149 from johnhaddon/zeroLengthGLPointsFix

andrewkaufman · andrewkaufman · commit 8d348c693311 · 2013-10-18T12:14:14.000-07:00
Fixed IECoreGL::PointsPrimitive crash on OS X.
diff --git a/src/IECoreGL/PointsPrimitive.cpp b/src/IECoreGL/PointsPrimitive.cpp
@@ -275,6 +275,12 @@ const Shader::Setup *PointsPrimitive::shaderSetup( const Shader *shader, State *
 
 void PointsPrimitive::render( const State *currentState, IECore::TypeId style ) const
 {
+	if( !m_memberData->points->readable().size() )
+	{
+		// early out if no points - some drivers crash otherwise
+		return;
+	}
+	
 	/*if( depthSortRequested( state ) )
 	{
 		depthSort();

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,12 @@ const Shader::Setup PointsPrimitive::shaderSetup( const Shader shader, State *`
`275`	`275`
`276`	`276`	`void PointsPrimitive::render( const State *currentState, IECore::TypeId style ) const`
`277`	`277`	`{`
	`278`	`+ if( !m_memberData->points->readable().size() )`
	`279`	`+ {`
	`280`	`+ // early out if no points - some drivers crash otherwise`
	`281`	`+ return;`
	`282`	`+ }`
	`283`	`+`
`278`	`284`	`/*if( depthSortRequested( state ) )`
`279`	`285`	`{`
`280`	`286`	`depthSort();`