diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-11-09 07:46:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-09 07:47:08 +0300 |
commit | 8c846cccd6bdfd3e90a695fabbf05f53e5466a57 (patch) | |
tree | 43dd63ccf63019781b248a85cbf5486200d24873 /source/blender/compositor/operations | |
parent | 39012146e142bf400c7140d90ecfd27c45b589ca (diff) |
Cleanup: clang-format
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r-- | source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp | 4 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_TextureOperation.cpp | 19 |
2 files changed, 16 insertions, 7 deletions
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; |