diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
| commit | 39dc956f593b3406bf1d81fb83c557b7b51f5327 (patch) | |
| tree | 50b59815aad48902a6563aefc8b944daf34c401e /source/blender/compositor/operations/COM_TranslateOperation.h | |
| parent | 5d5176095e82b34499e15d74f1fb76d56f4d9508 (diff) | |
| parent | d846c9a3b75c3d6f20bc7ab7d2da6cdd18bbbef2 (diff) | |
Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim
Conflicts:
intern/rigidbody/CMakeLists.txt
release/datafiles/splash.png
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_view3d_types.h
Diffstat (limited to 'source/blender/compositor/operations/COM_TranslateOperation.h')
| -rw-r--r-- | source/blender/compositor/operations/COM_TranslateOperation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h index a638ae7ce69..f2ae976e2ef 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.h +++ b/source/blender/compositor/operations/COM_TranslateOperation.h @@ -38,7 +38,7 @@ private: public: TranslateOperation(); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); - void executePixel(float output[4], float x, float y, PixelSampler sampler); + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); void initExecution(); void deinitExecution(); @@ -49,9 +49,9 @@ public: inline void ensureDelta() { if (!this->m_isDeltaSet) { float tempDelta[4]; - this->m_inputXOperation->read(tempDelta, 0, 0, COM_PS_NEAREST); + this->m_inputXOperation->readSampled(tempDelta, 0, 0, COM_PS_NEAREST); this->m_deltaX = tempDelta[0]; - this->m_inputYOperation->read(tempDelta, 0, 0, COM_PS_NEAREST); + this->m_inputYOperation->readSampled(tempDelta, 0, 0, COM_PS_NEAREST); this->m_deltaY = tempDelta[0]; this->m_isDeltaSet = true; } |