blender
/
blender
136
413
Fork 596
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

Fix #105590: Compositor: Masks don't consider anamorphic aspect ratio #106121

Merged
Jeroen Bakker merged 5 commits from zazizizou/blender:fix-105590-com-aspect-ratio into main 2023-03-28 12:36:26 +02:00
Conversation 3 Commits 5 Files Changed 2 +24 -1
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/compositor/nodes/COM_MaskNode.cc
View File

@ -3,6 +3,7 @@
#include "COM_MaskNode.h"
#include "COM_MaskOperation.h"
#include "COM_ScaleOperation.h"
namespace blender::compositor {
@ -50,7 +51,21 @@ void MaskNode::convert_to_operations(NodeConverter &converter,
}
converter.add_operation(operation);
converter.map_output_socket(output_mask, operation->get_output_socket());
ScaleFixedSizeOperation *scale_operation = new ScaleFixedSizeOperation();
zazizizou marked this conversation as resolved
Jeroen Bakker commented 2023-03-27 08:46:20 +02:00
Review
Copy Link

Please run clang-format (or configure your IDE to do so) double empty lines aren't allowed by our code style.

Please run clang-format (or configure your IDE to do so) double empty lines aren't allowed by our code style.
scale_operation->set_variable_size(true);
/* Consider aspect ratio from scene. */
const int new_height = rd->xasp / rd->yasp * operation->get_mask_height();
scale_operation->set_new_height(new_height);
scale_operation->set_new_width(operation->get_mask_width());
scale_operation->set_is_aspect(false);
scale_operation->set_is_crop(false);
scale_operation->set_scale_canvas_max_size({float(data->size_x), float(data->size_y)});
converter.add_operation(scale_operation);
converter.add_link(operation->get_output_socket(0), scale_operation->get_input_socket(0));
converter.map_output_socket(output_mask, scale_operation->get_output_socket(0));
}
} // namespace blender::compositor

8
source/blender/compositor/operations/COM_MaskOperation.h
View File

@ -63,6 +63,14 @@ class MaskOperation : public MultiThreadedOperation {
mask_height_inv_ = 1.0f / (float)height;
mask_px_ofs_[1] = mask_height_inv_ * 0.5f;
}
int get_mask_width()
{
return mask_width_;
}
int get_mask_height()
{
return mask_height_;
}
void set_framenumber(int frame_number)
{
frame_number_ = frame_number;