From 36d770d3db8f35c0669e40747be1136ae3451fb0 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 27 Sep 2016 19:47:27 +0200 Subject: [PATCH] OpenGEX: fix some review findings. --- code/OpenGEXImporter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/OpenGEXImporter.cpp b/code/OpenGEXImporter.cpp index b1df47a71..3ce53c481 100644 --- a/code/OpenGEXImporter.cpp +++ b/code/OpenGEXImporter.cpp @@ -281,7 +281,7 @@ OpenGEXImporter::OpenGEXImporter() //------------------------------------------------------------------------------------------------ OpenGEXImporter::~OpenGEXImporter() { - m_ctx = NULL; + m_ctx = nullptr; } //------------------------------------------------------------------------------------------------ @@ -466,13 +466,13 @@ void OpenGEXImporter::handleMetricNode( DDLNode *node, aiScene *pScene ) { //------------------------------------------------------------------------------------------------ void OpenGEXImporter::handleNameNode( DDLNode *node, aiScene *pScene ) { - if( NULL == m_currentNode ) { + if( nullptr == m_currentNode ) { throw DeadlyImportError( "No current node for name." ); return; } Value *val( node->getValue() ); - if( NULL != val ) { + if( nullptr != val ) { if( Value::ddl_string != val->m_type ) { throw DeadlyImportError( "OpenGEX: invalid data type for value in node name." ); return; @@ -490,7 +490,7 @@ void OpenGEXImporter::handleNameNode( DDLNode *node, aiScene *pScene ) { //------------------------------------------------------------------------------------------------ static void getRefNames( DDLNode *node, std::vector &names ) { - ai_assert( NULL != node ); + ai_assert( nullptr != node ); Reference *ref = node->getReferences(); if( nullptr != ref ) { @@ -1124,10 +1124,10 @@ void OpenGEXImporter::resolveReferences() { return; } - RefInfo *currentRefInfo( NULL ); + RefInfo *currentRefInfo( nullptr ); for( std::vector::iterator it = m_unresolvedRefStack.begin(); it != m_unresolvedRefStack.end(); ++it ) { currentRefInfo = *it; - if( NULL != currentRefInfo ) { + if( nullptr != currentRefInfo ) { aiNode *node( currentRefInfo->m_node ); if( RefInfo::MeshRef == currentRefInfo->m_type ) { for( size_t i = 0; i < currentRefInfo->m_Names.size(); i++ ) { @@ -1166,7 +1166,7 @@ void OpenGEXImporter::createNodeTree( aiScene *pScene ) { void OpenGEXImporter::pushNode( aiNode *node, aiScene *pScene ) { ai_assert( nullptr != pScene ); - if ( NULL == node ) { + if ( nullptr == node ) { return; }