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.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/operations/COM_SetVectorOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_SetVectorOperation.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index 49088027762..dc2a05ceff4 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -31,10 +31,10 @@ */ class SetVectorOperation : public NodeOperation { private: - float x; - float y; - float z; - float w; + float m_x; + float m_y; + float m_z; + float m_w; public: /** @@ -42,14 +42,14 @@ public: */ SetVectorOperation(); - const float getX() { return this->x; } - void setX(float value) { this->x = value; } - const float getY() { return this->y; } - void setY(float value) { this->y = value; } - const float getZ() { return this->z; } - void setZ(float value) { this->z = value; } - const float getW() { return this->w; } - void setW(float value) { this->w = value; } + const float getX() { return this->m_x; } + void setX(float value) { this->m_x = value; } + const float getY() { return this->m_y; } + void setY(float value) { this->m_y = value; } + const float getZ() { return this->m_z; } + void setZ(float value) { this->m_z = value; } + const float getW() { return this->m_w; } + void setW(float value) { this->m_w = value; } /** * the inner loop of this program |