[Bf-blender-cvs] [bdbb422] master: Compositor: Get rid of hardcoded constants

[Sergey Sharybin]

Commit: bdbb4229b53ec2dd07b1b6da2c223dbc80eb2c56
Author: Sergey Sharybin
Date:   Mon Jun 30 18:09:26 2014 +0600
https://developer.blender.org/rBbdbb4229b53ec2dd07b1b6da2c223dbc80eb2c56

Compositor: Get rid of hardcoded constants

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

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 e6cde05..fba3e7a 100644
--- a/source/blender/compositor/operations/COM_WrapOperation.cpp
+++ b/source/blender/compositor/operations/COM_WrapOperation.cpp
@@ -77,13 +77,12 @@ void WrapOperation::executePixelSampled(float output[4], float x, float y, Pixel
 bool WrapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newInput;
-
 	newInput.xmin = input->xmin;
 	newInput.xmax = input->xmax;
 	newInput.ymin = input->ymin;
 	newInput.ymax = input->ymax;
 
-	if (m_wrappingType == 1 || m_wrappingType == 3) {
+	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);
@@ -92,7 +91,7 @@ bool WrapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
 			newInput.xmax = this->getWidth();
 		}
 	}
-	if (m_wrappingType == 2 || m_wrappingType == 3) {
+	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);