[Bf-blender-cvs] [36f0a1ead7c] blender-v2.92-release: Fix T84823: crash rendering with unconnected input socket in File Output node
Philipp Oeser
noreply at git.blender.org
Tue Jan 19 18:28:02 CET 2021
Commit: 36f0a1ead7ce59f6dd62e7fd032a28c49ae9a932
Author: Philipp Oeser
Date: Mon Jan 18 18:34:26 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB36f0a1ead7ce59f6dd62e7fd032a28c49ae9a932
Fix T84823: crash rendering with unconnected input socket in File Output node
Caused by rB957e292c5864.
Now just skip unconnected sockets.
Maniphest Tasks: T84823
Differential Revision: https://developer.blender.org/D10137
===================================================================
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index 0a7e238fed1..2f8740081a1 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -341,6 +341,10 @@ StampData *OutputOpenExrMultiLayerOperation::createStampData() const
render_result.stamp_data = stamp_data;
for (int i = 0; i < this->m_layers.size(); i++) {
const OutputOpenExrLayer *layer = &this->m_layers[i];
+ /* Skip unconnected sockets. */
+ if (layer->imageInput == nullptr) {
+ continue;
+ }
std::unique_ptr<MetaData> meta_data = layer->imageInput->getMetaData();
if (meta_data) {
blender::StringRef layer_name = blender::BKE_cryptomatte_extract_layer_name(
More information about the Bf-blender-cvs
mailing list