[Bf-blender-cvs] [8d023c1] master: Fix T38794: ScaleFixedSizeOperation was not taking offset into account when calculating depending-area-of-interest.

[Lukas Tönne]

Commit: 8d023c1ad0a1ac27ecfb20c65a61394363bbbb34
Author: Lukas Tönne
Date:   Mon Feb 24 13:07:40 2014 +0100
https://developer.blender.org/rB8d023c1ad0a1ac27ecfb20c65a61394363bbbb34

Fix T38794: ScaleFixedSizeOperation was not taking offset into account
when calculating depending-area-of-interest.

===================================================================

M       source/blender/compositor/operations/COM_ScaleOperation.cpp

===================================================================

diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp 
b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index 452765a..23e8ce8 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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs