From 8c846cccd6bdfd3e90a695fabbf05f53e5466a57 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 9 Nov 2020 15:46:15 +1100
Subject: Cleanup: clang-format

---
 source/blender/compositor/intern/COM_OpenCLDevice.cpp |  6 ++++--
 source/blender/compositor/nodes/COM_KeyingNode.cpp    |  3 ++-
 .../operations/COM_OutputFileMultiViewOperation.cpp   |  4 ++--
 .../compositor/operations/COM_TextureOperation.cpp    | 19 ++++++++++++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'source/blender/compositor')

diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 35579bac925..51ae9d6652e 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -196,7 +196,8 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemo
       (size_t)outputMemoryBuffer->getHeight(),
   };
 
-  error = clEnqueueNDRangeKernel(this->m_queue, kernel, 2, nullptr, size, nullptr, 0, nullptr, nullptr);
+  error = clEnqueueNDRangeKernel(
+      this->m_queue, kernel, 2, nullptr, size, nullptr, 0, nullptr, nullptr);
   if (error != CL_SUCCESS) {
     printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
   }
@@ -243,7 +244,8 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel,
       if (error != CL_SUCCESS) {
         printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
       }
-      error = clEnqueueNDRangeKernel(this->m_queue, kernel, 2, nullptr, size, nullptr, 0, nullptr, nullptr);
+      error = clEnqueueNDRangeKernel(
+          this->m_queue, kernel, 2, nullptr, size, nullptr, 0, nullptr, nullptr);
       if (error != CL_SUCCESS) {
         printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
       }
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp
index 89ad4edce02..9f0cdcbd552 100644
--- a/source/blender/compositor/nodes/COM_KeyingNode.cpp
+++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp
@@ -228,7 +228,8 @@ void KeyingNode::convertToOperations(NodeConverter &converter,
   NodeOutput *outputImage = this->getOutputSocket(0);
   NodeOutput *outputMatte = this->getOutputSocket(1);
   NodeOutput *outputEdges = this->getOutputSocket(2);
-  NodeOperationOutput *postprocessedMatte = nullptr, *postprocessedImage = nullptr, *edgesMatte = nullptr;
+  NodeOperationOutput *postprocessedMatte = nullptr, *postprocessedImage = nullptr,
+                      *edgesMatte = nullptr;
 
   /* keying operation */
   KeyingOperation *keyingOperation = new KeyingOperation();
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 639da7c8ae6..f7fabfb9572 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -83,8 +83,8 @@ void *OutputOpenExrSingleLayerMultiViewOperation::get_handle(const char *filenam
 
     /* prepare the file with all the channels */
 
-    if (IMB_exr_begin_write(exrhandle, filename, width, height, this->m_format->exr_codec, nullptr) ==
-        0) {
+    if (IMB_exr_begin_write(
+            exrhandle, filename, width, height, this->m_format->exr_codec, nullptr) == 0) {
       printf("Error Writing Singlelayer Multiview Openexr\n");
       IMB_exr_close(exrhandle);
     }
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index 582decc6a1b..e66cd57cb3f 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cpp
+++ b/source/blender/compositor/operations/COM_TextureOperation.cpp
@@ -51,7 +51,8 @@ void TextureBaseOperation::initExecution()
   this->m_inputOffset = getInputSocketReader(0);
   this->m_inputSize = getInputSocketReader(1);
   this->m_pool = BKE_image_pool_new();
-  if (this->m_texture != nullptr && this->m_texture->nodetree != nullptr && this->m_texture->use_nodes) {
+  if (this->m_texture != nullptr && this->m_texture->nodetree != nullptr &&
+      this->m_texture->use_nodes) {
     ntreeTexBeginExecTree(this->m_texture->nodetree);
   }
   NodeOperation::initExecution();
@@ -62,8 +63,8 @@ void TextureBaseOperation::deinitExecution()
   this->m_inputOffset = nullptr;
   BKE_image_pool_free(this->m_pool);
   this->m_pool = nullptr;
-  if (this->m_texture != nullptr && this->m_texture->use_nodes && this->m_texture->nodetree != nullptr &&
-      this->m_texture->nodetree->execdata != nullptr) {
+  if (this->m_texture != nullptr && this->m_texture->use_nodes &&
+      this->m_texture->nodetree != nullptr && this->m_texture->nodetree->execdata != nullptr) {
     ntreeTexEndExecTree(this->m_texture->nodetree->execdata);
   }
   NodeOperation::deinitExecution();
@@ -127,8 +128,16 @@ void TextureBaseOperation::executePixelSampled(float output[4],
   vec[2] = textureSize[2] * textureOffset[2];
 
   const int thread_id = WorkScheduler::current_thread_id();
-  retval = multitex_ext(
-      this->m_texture, vec, nullptr, nullptr, 0, &texres, thread_id, m_pool, m_sceneColorManage, false);
+  retval = multitex_ext(this->m_texture,
+                        vec,
+                        nullptr,
+                        nullptr,
+                        0,
+                        &texres,
+                        thread_id,
+                        m_pool,
+                        m_sceneColorManage,
+                        false);
 
   if (texres.talpha) {
     output[3] = texres.ta;
-- 
cgit v1.2.3