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
path: root/source
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-02-04 20:50:20 +0400
committerThomas Dinges <blender@dingto.org>2013-02-04 20:50:20 +0400
commita6f5a729fcd4e2686f955c8029818f0e92f8c8a2 (patch)
treef727cbd63721511f3b92bd2078303cdff77fe70b /source
parent9d713688bacfb9832cd7951eccaa05b5b977ff9a (diff)
Compile fix for r54300, setFactorXY function does not return a value.
Diffstat (limited to 'source')
-rw-r--r--source/blender/compositor/operations/COM_TranslateOperation.cpp2
-rw-r--r--source/blender/compositor/operations/COM_TranslateOperation.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cpp b/source/blender/compositor/operations/COM_TranslateOperation.cpp
index 27651a772ee..32b9398094d 100644
--- a/source/blender/compositor/operations/COM_TranslateOperation.cpp
+++ b/source/blender/compositor/operations/COM_TranslateOperation.cpp
@@ -183,7 +183,7 @@ float TranslateOperation::getWrappedOriginalYPos(float y)
return fmodf(originalYPos, this->getHeight());
}
-float TranslateOperation::setFactorXY(float factorX, float factorY)
+void TranslateOperation::setFactorXY(float factorX, float factorY)
{
m_factorX = factorX;
m_factorY = factorY;
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h
index 4512f97550c..accca527400 100644
--- a/source/blender/compositor/operations/COM_TranslateOperation.h
+++ b/source/blender/compositor/operations/COM_TranslateOperation.h
@@ -64,7 +64,7 @@ public:
float getWrappedOriginalXPos(float x);
float getWrappedOriginalYPos(float y);
- float setFactorXY(float factorX, float factorY);
+ void setFactorXY(float factorX, float factorY);
};
#endif