[Bf-blender-cvs] [b43d4c63cfe] master: Cleanup: Removed commented out code.
Jeroen Bakker
noreply at git.blender.org
Tue Mar 16 15:08:37 CET 2021
Commit: b43d4c63cfea3248d216f23a1a1881f64f5844f7
Author: Jeroen Bakker
Date: Tue Mar 16 13:35:21 2021 +0100
Branches: master
https://developer.blender.org/rBb43d4c63cfea3248d216f23a1a1881f64f5844f7
Cleanup: Removed commented out code.
===================================================================
M source/blender/compositor/intern/COM_Debug.cc
M source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_Debug.cc b/source/blender/compositor/intern/COM_Debug.cc
index bee3026816e..722d544a362 100644
--- a/source/blender/compositor/intern/COM_Debug.cc
+++ b/source/blender/compositor/intern/COM_Debug.cc
@@ -314,18 +314,6 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "rankdir=LR\r\n");
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "splines=false\r\n");
-# if 0
- for (ExecutionSystem::Operations::const_iterator it = system->m_operations.begin();
- it != system->m_operations.end();
- ++it) {
- NodeOperation *op = *it;
- len += snprintf(str + len,
- maxlen > len ? maxlen - len : 0,
- "// OPERATION: %s\r\n",
- node->getbNode()->typeinfo->ui_name);
- }
-# endif
-
int totops = system->m_operations.size();
int totgroups = system->m_groups.size();
std::map<NodeOperation *, std::vector<std::string>> op_groups;
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index fce1310f6ef..41e4b86bdd2 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -266,11 +266,6 @@ class MemoryBuffer {
BLI_assert(offset < this->determineBufferSize() * this->m_num_channels);
BLI_assert(!(extend_x == COM_MB_CLIP && (u < m_rect.xmin || u >= m_rect.xmax)) &&
!(extend_y == COM_MB_CLIP && (v < m_rect.ymin || v >= m_rect.ymax)));
-#if 0
- /* always true */
- BLI_assert((int)(MEM_allocN_len(this->m_buffer) / sizeof(*this->m_buffer)) ==
- (int)(this->determineBufferSize() * COM_NUMBER_OF_CHANNELS));
-#endif
float *buffer = &this->m_buffer[offset];
memcpy(result, buffer, sizeof(float) * this->m_num_channels);
}
More information about the Bf-blender-cvs
mailing list