diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
| commit | 9324503b84a06f76af072131da947547c84698ed (patch) | |
| tree | b9336118dcf8df9e9ca4888d9ee3ac9fec2c2798 /source/blender/compositor/intern/COM_MemoryProxy.h | |
| parent | 234c338655fc49efef0b7ffe0ef6736e8630411a (diff) | |
| parent | 958cf139f6587df631944f6ec0fcb4111c7e58fa (diff) | |
Merge with trunk r48602
Diffstat (limited to 'source/blender/compositor/intern/COM_MemoryProxy.h')
| -rw-r--r-- | source/blender/compositor/intern/COM_MemoryProxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index f02da215b5f..130c5f5057a 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -50,12 +50,12 @@ private: /** * @brief datatype of this MemoryProxy */ - DataType m_datatype; + /* DataType m_datatype; */ /* UNUSED */ /** * @brief channel information of this buffer */ - ChannelInfo m_channelInfo[COM_NUMBER_OF_CHANNELS]; + /* ChannelInfo m_channelInfo[COM_NUMBER_OF_CHANNELS]; */ /* UNUSED */ /** * @brief the allocated memory |