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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-15 12:01:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-15 12:01:41 +0400
commit9c55e7b9956313bbaf034925e49abbd0260fe457 (patch)
treec63d6d02ce0f9117acb34f1902ba44cf104ae1e4 /source/blender/compositor/operations/COM_ScaleOperation.cpp
parent46ea5670db378048fc1339b5e355523842fa82a2 (diff)
add node scale offset for old compositor too - also fix for error in last commit.
Diffstat (limited to 'source/blender/compositor/operations/COM_ScaleOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index 45e846998af..2e23df73b67 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp
@@ -223,13 +223,13 @@ void ScaleFixedSizeOperation::initExecution()
/* fit X */
const float div = asp_src / asp_dst;
this->relX /= div;
- this->offsetX = ((w_src - (w_src * div)) / (w_src / w_dst)) / 2.0f;
+ this->offsetX += ((w_src - (w_src * div)) / (w_src / w_dst)) / 2.0f;
}
else {
/* fit Y */
const float div = asp_dst / asp_src;
this->relY /= div;
- this->offsetY = ((h_src - (h_src * div)) / (h_src / h_dst)) / 2.0f;
+ this->offsetY += ((h_src - (h_src * div)) / (h_src / h_dst)) / 2.0f;
}
this->is_offset = true;