Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for [#32931] Crop node resets values to 0

Browse Source 
Patch done by Markus Kasten
Thanks for that!
This commit is contained in:
Jeroen Bakker
2012-10-21 18:56:48 +00:00
parent 248b2fc6d6
commit 4426e7bcb4
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/compositor/operations/COM_CropOperation.cpp
View File

@@ -36,25 +36,29 @@ void CropBaseOperation::updateArea()
SocketReader *inputReference = this->getInputSocketReader(0);
float width = inputReference->getWidth();
float height = inputReference->getHeight();
if (this->m_relative) {
this->m_settings->x1 = width * this->m_settings->fac_x1;
this->m_settings->x2 = width * this->m_settings->fac_x2;
this->m_settings->y1 = height * this->m_settings->fac_y1;
this->m_settings->y2 = height * this->m_settings->fac_y2;
}
if (width <= this->m_settings->x1 + 1)
this->m_settings->x1 = width - 1;
if (height <= this->m_settings->y1 + 1)
this->m_settings->y1 = height - 1;
if (width <= this->m_settings->x2 + 1)
this->m_settings->x2 = width - 1;
if (height <= this->m_settings->y2 + 1)
this->m_settings->y2 = height - 1;
this->m_xmax = MAX2(this->m_settings->x1, this->m_settings->x2) + 1;
this->m_xmin = MIN2(this->m_settings->x1, this->m_settings->x2);
this->m_ymax = MAX2(this->m_settings->y1, this->m_settings->y2) + 1;
this->m_ymin = MIN2(this->m_settings->y1, this->m_settings->y2);
if (width > 0.0f && height > 0.0f)
{
if (this->m_relative) {
this->m_settings->x1 = width * this->m_settings->fac_x1;
this->m_settings->x2 = width * this->m_settings->fac_x2;
this->m_settings->y1 = height * this->m_settings->fac_y1;
this->m_settings->y2 = height * this->m_settings->fac_y2;
}
if (width <= this->m_settings->x1 + 1)
this->m_settings->x1 = width - 1;
if (height <= this->m_settings->y1 + 1)
this->m_settings->y1 = height - 1;
if (width <= this->m_settings->x2 + 1)
this->m_settings->x2 = width - 1;
if (height <= this->m_settings->y2 + 1)
this->m_settings->y2 = height - 1;
this->m_xmax = MAX2(this->m_settings->x1, this->m_settings->x2) + 1;
this->m_xmin = MIN2(this->m_settings->x1, this->m_settings->x2);
this->m_ymax = MAX2(this->m_settings->y1, this->m_settings->y2) + 1;
this->m_ymin = MIN2(this->m_settings->y1, this->m_settings->y2);
}
}
void CropBaseOperation::initExecution()