diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-18 16:54:41 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-19 09:02:29 +0400 |
| commit | 19e627cab34a04a3d01b2e3a868b7bf91d56e8f9 (patch) | |
| tree | 2b01e4e108bebcf0954bb58fe734a65bc514e279 /source/blender/compositor/operations/COM_MapUVOperation.cpp | |
| parent | 2525f9c5f31e90bcb8f2e8c84558a2bc35e3207c (diff) | |
Backport revisions for the final 2.70 releasev2.70
e6a359a, 9437927, a205700, d908c90, a6e3471, deef641,
4080673, 0141265, 0c6e744, f959e3d, ade6646, caf5d90,
5febb09, d08e6ab, 22873ea, 3d031d1, c450ea2, 60cab47,
ed26edb, df25dbf, f127f49.
Diffstat (limited to 'source/blender/compositor/operations/COM_MapUVOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_MapUVOperation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cpp b/source/blender/compositor/operations/COM_MapUVOperation.cpp index 292f073548a..87ad1d6afa4 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cpp +++ b/source/blender/compositor/operations/COM_MapUVOperation.cpp @@ -29,6 +29,7 @@ MapUVOperation::MapUVOperation() : NodeOperation() this->addOutputSocket(COM_DT_COLOR); this->m_alpha = 0.0f; this->setComplex(true); + setResolutionInputSocketIndex(1); this->m_inputUVProgram = NULL; this->m_inputColorProgram = NULL; @@ -84,8 +85,8 @@ bool MapUVOperation::read_uv(float x, float y, float &r_u, float &r_v, float &r_ else { float col[4]; m_inputUVProgram->readSampled(col, x, y, COM_PS_BILINEAR); - r_u = col[0] * width; - r_v = col[1] * height; + r_u = col[0] * m_inputColorProgram->getWidth(); + r_v = col[1] * m_inputColorProgram->getHeight(); r_alpha = col[2]; return true; } |