blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Compositor: Fix Movie Distortion node rendering an empty image 

Input area of interest calculation was incorrect because `m_margin`
was uninitialized.
Only "Full Frame" mode was affected.
This commit is contained in:
Manuel Castilla 2021-09-29 21:27:26 +02:00
parent 33dc584b37
commit 4569d9c0c3
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/compositor/operations/COM_MovieDistortionOperation.cc
View File

@ -35,9 +35,8 @@ MovieDistortionOperation::MovieDistortionOperation(bool distortion)
this->m_apply = distortion;
}
void MovieDistortionOperation::initExecution()
void MovieDistortionOperation::init_data()
{
this->m_inputOperation = this->getInputSocketReader(0);
if (this->m_movieClip) {
MovieTracking *tracking = &this->m_movieClip->tracking;
MovieClipUser clipUser = {0};
@ -60,15 +59,25 @@ void MovieDistortionOperation::initExecution()
m_margin[0] = delta[0] + 5;
m_margin[1] = delta[1] + 5;
this->m_distortion = BKE_tracking_distortion_new(
tracking, calibration_width, calibration_height);
this->m_calibration_width = calibration_width;
this->m_calibration_height = calibration_height;
this->m_pixel_aspect = tracking->camera.pixel_aspect;
}
else {
m_margin[0] = m_margin[1] = 0;
this->m_distortion = nullptr;
}
}
void MovieDistortionOperation::initExecution()
{
m_inputOperation = this->getInputSocketReader(0);
if (m_movieClip) {
MovieTracking *tracking = &m_movieClip->tracking;
m_distortion = BKE_tracking_distortion_new(
tracking, m_calibration_width, m_calibration_height);
}
else {
m_distortion = nullptr;
}
}

1
source/blender/compositor/operations/COM_MovieDistortionOperation.h
View File

@ -44,6 +44,7 @@ class MovieDistortionOperation : public MultiThreadedOperation {
MovieDistortionOperation(bool distortion);
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void init_data() override;
void initExecution() override;
void deinitExecution() override;