Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-02-24 16:07:40 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-02-24 16:09:01 +0400
commit8d023c1ad0a1ac27ecfb20c65a61394363bbbb34 (patch)
tree6062aa631f866f19c7263b49771b36c41447e12c /source/blender/compositor/operations/COM_ScaleOperation.cpp
parent9643b2e5b50399c8224d6de8d150d88c0d3e2848 (diff)
Fix T38794: ScaleFixedSizeOperation was not taking offset into account
when calculating depending-area-of-interest.
Diffstat (limited to 'source/blender/compositor/operations/COM_ScaleOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index 452765a5ab7..23e8ce86fd9 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp
@@ -271,10 +271,10 @@ bool ScaleFixedSizeOperation::determineDependingAreaOfInterest(rcti *input, Read
{
rcti newInput;
- newInput.xmax = input->xmax * this->m_relX;
- newInput.xmin = input->xmin * this->m_relX;
- newInput.ymax = input->ymax * this->m_relY;
- newInput.ymin = input->ymin * this->m_relY;
+ newInput.xmax = (input->xmax - m_offsetX) * this->m_relX;
+ newInput.xmin = (input->xmin - m_offsetX) * this->m_relX;
+ newInput.ymax = (input->ymax - m_offsetY) * this->m_relY;
+ newInput.ymin = (input->ymin - m_offsetY) * this->m_relY;
return BaseScaleOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}