Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
@@ -370,7 +370,7 @@ bool CTrackViewAnimNode::IsBoundToEditorObjects() const
|
||||
else
|
||||
{
|
||||
// check if bound to legacy entity
|
||||
return (m_animNode->GetNodeOwner() != NULL);
|
||||
return (m_animNode->GetNodeOwner() != nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1468,7 +1468,7 @@ bool CTrackViewAnimNode::PasteNodesFromClipboard(QWidget* context)
|
||||
}
|
||||
|
||||
XmlNodeRef animNodesRoot = clipboard.Get();
|
||||
if (animNodesRoot == NULL || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
|
||||
if (animNodesRoot == nullptr || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user