Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-24 06:54:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-24 06:59:35 +0300
commit4d978cc2e496eb0287b3b828ac105bb767da4bb4 (patch)
tree423c3e524b8531ce95c04211c5bd9c107d2bf0b3 /source/blender/compositor
parentbb98e83b99e63348e0396a5ffe5bb2a20ff1607a (diff)
Cleanup: changes from 2.8
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/nodes/COM_CryptomatteNode.cpp6
-rw-r--r--source/blender/compositor/operations/COM_CryptomatteOperation.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
index bc115e66c20..5ed66fe45e7 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp
@@ -62,7 +62,7 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter, const Compos
bNode *node = this->getbNode();
NodeCryptomatte *cryptoMatteSettings = (NodeCryptomatte *)node->storage;
- CryptomatteOperation *operation = new CryptomatteOperation(getNumberOfInputSockets()-1);
+ CryptomatteOperation *operation = new CryptomatteOperation(getNumberOfInputSockets() - 1);
if (cryptoMatteSettings) {
if (cryptoMatteSettings->matte_id) {
/* Split the string by commas, ignoring white space. */
@@ -83,7 +83,7 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter, const Compos
operation->addObjectIndex(atof(token.substr(1, token.length() - 2).c_str()));
}
else {
- uint32_t hash = BLI_hash_mm3((const unsigned char*)token.c_str(), token.length(), 0);
+ uint32_t hash = BLI_hash_mm3((const unsigned char *)token.c_str(), token.length(), 0);
operation->addObjectIndex(hash_to_float(hash));
}
}
@@ -93,7 +93,7 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter, const Compos
converter.addOperation(operation);
- for (int i = 0; i < getNumberOfInputSockets()-1; ++i) {
+ for (int i = 0; i < getNumberOfInputSockets() - 1; ++i) {
converter.mapInputSocket(this->getInputSocket(i + 1), operation->getInputSocket(i));
}
diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
index 9dd36863d37..f3fa81075c6 100644
--- a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
@@ -63,7 +63,7 @@ void CryptomatteOperation::executePixel(float output[4],
output[1] = ((float) ((m3hash << 8)) / (float) UINT32_MAX);
output[2] = ((float) ((m3hash << 16)) / (float) UINT32_MAX);
}
- for(size_t i = 0; i < m_objectIndex.size(); i++) {
+ for (size_t i = 0; i < m_objectIndex.size(); i++) {
if (m_objectIndex[i] == input[0]) {
output[3] += input[1];
}