kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T44494 crop node changes values during execution.

Browse Source 
We used the node data as a store for node execution,
bad idea, since the data itself is a template from which
execution data should be derived, never to be modified during execution.
This commit is contained in:
Antony Riakiotakis 2015-04-23 14:23:28 +02:00
parent 2dfbf31a41
commit bcac112dde
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,27 +36,28 @@ void CropBaseOperation::updateArea()
SocketReader *inputReference = this->getInputSocketReader(0); SocketReader *inputReference = this->getInputSocketReader(0);
float width = inputReference->getWidth(); float width = inputReference->getWidth();
float height = inputReference->getHeight(); float height = inputReference->getHeight();
NodeTwoXYs local_settings = *this->m_settings;
if (width > 0.0f && height > 0.0f) { if (width > 0.0f && height > 0.0f) {
if (this->m_relative) { if (this->m_relative) {
this->m_settings->x1 = width * this->m_settings->fac_x1; local_settings.x1 = width * local_settings.fac_x1;
this->m_settings->x2 = width * this->m_settings->fac_x2; local_settings.x2 = width * local_settings.fac_x2;
this->m_settings->y1 = height * this->m_settings->fac_y1; local_settings.y1 = height * local_settings.fac_y1;
this->m_settings->y2 = height * this->m_settings->fac_y2; local_settings.y2 = height * local_settings.fac_y2;
} }
if (width <= this->m_settings->x1 + 1) if (width <= local_settings.x1 + 1)
this->m_settings->x1 = width - 1; local_settings.x1 = width - 1;
if (height <= this->m_settings->y1 + 1) if (height <= local_settings.y1 + 1)
this->m_settings->y1 = height - 1; local_settings.y1 = height - 1;
if (width <= this->m_settings->x2 + 1) if (width <= local_settings.x2 + 1)
this->m_settings->x2 = width - 1; local_settings.x2 = width - 1;
if (height <= this->m_settings->y2 + 1) if (height <= local_settings.y2 + 1)
this->m_settings->y2 = height - 1; local_settings.y2 = height - 1;
this->m_xmax = max(this->m_settings->x1, this->m_settings->x2) + 1; this->m_xmax = max(local_settings.x1, local_settings.x2) + 1;
this->m_xmin = min(this->m_settings->x1, this->m_settings->x2); this->m_xmin = min(local_settings.x1, local_settings.x2);
this->m_ymax = max(this->m_settings->y1, this->m_settings->y2) + 1; this->m_ymax = max(local_settings.y1, local_settings.y2) + 1;
this->m_ymin = min(this->m_settings->y1, this->m_settings->y2); this->m_ymin = min(local_settings.y1, local_settings.y2);
} }
else { else {
this->m_xmax = 0; this->m_xmax = 0;