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_Socket.cpp | |
| parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
| parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) | |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/intern/COM_Socket.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_Socket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/compositor/intern/COM_Socket.cpp b/source/blender/compositor/intern/COM_Socket.cpp index 11739a4e9c5..30f28f9dddb 100644 --- a/source/blender/compositor/intern/COM_Socket.cpp +++ b/source/blender/compositor/intern/COM_Socket.cpp @@ -26,18 +26,18 @@ Socket::Socket(DataType datatype) { - this->datatype = datatype; - this->editorSocket = NULL; - this->node = NULL; + this->m_datatype = datatype; + this->m_editorSocket = NULL; + this->m_node = NULL; } DataType Socket::getDataType() const { - return this->datatype; + return this->m_datatype; } int Socket::isInputSocket() const { return false; } int Socket::isOutputSocket() const { return false; } const int Socket::isConnected() const { return false; } -void Socket::setNode(NodeBase *node) { this->node = node; } -NodeBase *Socket::getNode() const { return this->node; } +void Socket::setNode(NodeBase *node) { this->m_node = node; } +NodeBase *Socket::getNode() const { return this->m_node; } |