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/intern/COM_InputSocket.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/intern/COM_InputSocket.h')
-rw-r--r-- | source/blender/compositor/intern/COM_InputSocket.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h index c066b5d8303..5d0923ff204 100644 --- a/source/blender/compositor/intern/COM_InputSocket.h +++ b/source/blender/compositor/intern/COM_InputSocket.h @@ -65,12 +65,12 @@ private: * @brief connection connected to this InputSocket. * An input socket can only have a single connection */ - SocketConnection *connection; + SocketConnection *m_connection; /** * @brief resize mode of this socket */ - InputSocketResizeMode resizeMode; + InputSocketResizeMode m_resizeMode; public: @@ -126,7 +126,7 @@ public: * @param resizeMode the new resize mode. */ void setResizeMode(InputSocketResizeMode resizeMode) { - this->resizeMode = resizeMode; + this->m_resizeMode = resizeMode; } /** @@ -134,7 +134,7 @@ public: * @return InputSocketResizeMode */ InputSocketResizeMode getResizeMode() const { - return this->resizeMode; + return this->m_resizeMode; } const ChannelInfo *getChannelInfo(const int channelnumber); |