diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/operations/COM_SetVectorOperation.cpp | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/operations/COM_SetVectorOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_SetVectorOperation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.cpp b/source/blender/compositor/operations/COM_SetVectorOperation.cpp index 3d15a184c4e..f37bc489e75 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.cpp +++ b/source/blender/compositor/operations/COM_SetVectorOperation.cpp @@ -30,10 +30,10 @@ SetVectorOperation::SetVectorOperation() : NodeOperation() void SetVectorOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { - outputValue[0] = this->x; - outputValue[1] = this->y; - outputValue[2] = this->z; - outputValue[3] = this->w; + outputValue[0] = this->m_x; + outputValue[1] = this->m_y; + outputValue[2] = this->m_z; + outputValue[3] = this->m_w; } void SetVectorOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) |