1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 53a6d115e97..1237e728079 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -38,7 +38,7 @@
 #include "COM_NodeOperationBuilder.h" /* own include */
 
 NodeOperationBuilder::NodeOperationBuilder(const CompositorContext *context, bNodeTree *b_nodetree)
-    : m_context(context), m_current_node(NULL), m_active_viewer(NULL)
+    : m_context(context), m_current_node(nullptr), m_active_viewer(nullptr)
 {
   m_graph.from_bNodeTree(*context, b_nodetree);
 }
@@ -61,7 +61,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
     node->convertToOperations(converter, *m_context);
   }
 
-  m_current_node = NULL;
+  m_current_node = nullptr;
 
   /* The input map constructed by nodes maps operation inputs to node inputs.
    * Inverting yields a map of node inputs to all connected operation inputs,
@@ -168,7 +168,7 @@ void NodeOperationBuilder::removeInputLink(NodeOperationInput *to)
     Link &link = *it;
     if (link.to() == to) {
       /* unregister with the input */
-      to->setLink(NULL);
+      to->setLink(nullptr);
 
       m_links.erase(it);
       return;
@@ -203,15 +203,15 @@ PreviewOperation *NodeOperationBuilder::make_preview_operation() const
   BLI_assert(m_current_node);
 
   if (!(m_current_node->getbNode()->flag & NODE_PREVIEW)) {
-    return NULL;
+    return nullptr;
   }
   /* previews only in the active group */
   if (!m_current_node->isInActiveGroup()) {
-    return NULL;
+    return nullptr;
   }
   /* do not calculate previews of hidden nodes */
   if (m_current_node->getbNode()->flag & NODE_HIDDEN) {
-    return NULL;
+    return nullptr;
   }
 
   bNodeInstanceHash *previews = m_context->getPreviewHash();
@@ -223,7 +223,7 @@ PreviewOperation *NodeOperationBuilder::make_preview_operation() const
     return operation;
   }
 
-  return NULL;
+  return nullptr;
 }
 
 void NodeOperationBuilder::addPreview(NodeOperationOutput *output)
@@ -476,7 +476,7 @@ WriteBufferOperation *NodeOperationBuilder::find_attached_write_buffer_operation
       }
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 void NodeOperationBuilder::add_input_buffers(NodeOperation * /*operation*/,
@@ -526,13 +526,13 @@ void NodeOperationBuilder::add_output_buffers(NodeOperation *operation,
     return;
   }
 
-  WriteBufferOperation *writeOperation = NULL;
+  WriteBufferOperation *writeOperation = nullptr;
   for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); ++it) {
     NodeOperationInput *target = *it;
 
     /* try to find existing write buffer operation */
     if (target->getOperation().isWriteBufferOperation()) {
-      BLI_assert(writeOperation == NULL); /* there should only be one write op connected */
+      BLI_assert(writeOperation == nullptr); /* there should only be one write op connected */
       writeOperation = (WriteBufferOperation *)(&target->getOperation());
     }
     else {
@@ -728,7 +728,7 @@ void NodeOperationBuilder::group_operations()
       ReadBufferOperation *read_op = (ReadBufferOperation *)op;
       MemoryProxy *memproxy = read_op->getMemoryProxy();
 
-      if (memproxy->getExecutor() == NULL) {
+      if (memproxy->getExecutor() == nullptr) {
         ExecutionGroup *group = make_group(memproxy->getWriteBufferOperation());
         memproxy->setExecutor(group);
       }