blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Compositor: Fix crash exporting buffers on debug 

ImBuf allocates 4 channels, use copying to support buffers
with 1 and 3 channels.
This commit is contained in:
Manuel Castilla 2021-09-18 19:04:47 +02:00
parent 942c471ce9
commit f256bfb3e2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/compositor/intern/COM_Debug.cc
View File

@ -468,11 +468,13 @@ static std::string get_operations_export_dir()
void DebugInfo::export_operation(const NodeOperation *op, MemoryBuffer *render)
{
ImBuf *ibuf = IMB_allocFromBuffer(nullptr,
render->getBuffer(),
render->getWidth(),
render->getHeight(),
render->get_num_channels());
const int width = render->getWidth();
const int height = render->getHeight();
const int num_channels = render->get_num_channels();
ImBuf *ibuf = IMB_allocImBuf(width, height, 8 * num_channels, IB_rectfloat);
MemoryBuffer mem_ibuf(ibuf->rect_float, 4, width, height);
mem_ibuf.copy_from(render, render->get_rect(), 0, num_channels, 0);
const std::string file_name = operation_class_name(op) + "_" + std::to_string(op->get_id()) +
".png";

2
source/blender/compositor/intern/COM_MemoryBuffer.cc
View File

@ -32,7 +32,7 @@
BLI_assert((buf)->get_rect().ymax >= (y) + BLI_rcti_size_y(&(area)))
#define ASSERT_VALID_ELEM_SIZE(buf, channel_offset, elem_size) \
BLI_assert((buf)->get_num_channels() <= (channel_offset) + (elem_size))
BLI_assert((buf)->get_num_channels() >= (channel_offset) + (elem_size))
namespace blender::compositor {