[Bf-blender-cvs] [03929ae] master: Fix T40878: Translate node is inconsistent
Sergey Sharybin
noreply at git.blender.org
Mon Jun 30 14:22:49 CEST 2014
Commit: 03929ae202c355b60f158ec191133a44fd9b1c09
Author: Sergey Sharybin
Date: Mon Jun 30 18:22:27 2014 +0600
https://developer.blender.org/rB03929ae202c355b60f158ec191133a44fd9b1c09
Fix T40878: Translate node is inconsistent
===================================================================
M source/blender/compositor/operations/COM_WrapOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_WrapOperation.cpp b/source/blender/compositor/operations/COM_WrapOperation.cpp
index fba3e7a..c30361d 100644
--- a/source/blender/compositor/operations/COM_WrapOperation.cpp
+++ b/source/blender/compositor/operations/COM_WrapOperation.cpp
@@ -85,8 +85,8 @@ bool WrapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
if (m_wrappingType == CMP_NODE_WRAP_X || m_wrappingType == CMP_NODE_WRAP_XY) {
// wrap only on the x-axis if tile is wrapping
newInput.xmin = getWrappedOriginalXPos(input->xmin);
- newInput.xmax = getWrappedOriginalXPos(input->xmax);
- if (newInput.xmin > newInput.xmax) {
+ newInput.xmax = getWrappedOriginalXPos(input->xmax) + 0.5f;
+ if (newInput.xmin >= newInput.xmax) {
newInput.xmin = 0;
newInput.xmax = this->getWidth();
}
@@ -94,8 +94,8 @@ bool WrapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
if (m_wrappingType == CMP_NODE_WRAP_Y || m_wrappingType == CMP_NODE_WRAP_XY) {
// wrap only on the y-axis if tile is wrapping
newInput.ymin = getWrappedOriginalYPos(input->ymin);
- newInput.ymax = getWrappedOriginalYPos(input->ymax);
- if (newInput.ymin > newInput.ymax) {
+ newInput.ymax = getWrappedOriginalYPos(input->ymax) + 0.5f;
+ if (newInput.ymin >= newInput.ymax) {
newInput.ymin = 0;
newInput.ymax = this->getHeight();
}
More information about the Bf-blender-cvs
mailing list