diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/compositor/intern/COM_MemoryProxy.cpp | |
parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
parent | b3727668168075137f2ded11d7a7821548e4451d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/intern/COM_MemoryProxy.cpp')
-rw-r--r-- | source/blender/compositor/intern/COM_MemoryProxy.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_MemoryProxy.cpp b/source/blender/compositor/intern/COM_MemoryProxy.cpp index 138b508c45b..b995f556db2 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.cpp +++ b/source/blender/compositor/intern/COM_MemoryProxy.cpp @@ -48,4 +48,3 @@ void MemoryProxy::free() this->m_buffer = NULL; } } - |