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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-11 14:57:57 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-11 14:57:57 +0300
commit39d24ffccb79d5b09a98866357bd9b8e3f77d379 (patch)
tree9ea3f85313a6f97d200460bdfc71b713a0bb2c4a /intern/cycles
parent6bc828ed876c938711bf0688e2ff09e9513e29fb (diff)
Cycles: Cleanup, indentation
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/nodes.cpp6
-rw-r--r--intern/cycles/render/svm.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1943f8c3e2b..a1f88dca466 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1713,9 +1713,9 @@ void RGBToBWNode::constant_fold(const ConstantFolder& folder)
void RGBToBWNode::compile(SVMCompiler& compiler)
{
compiler.add_node(NODE_CONVERT,
- NODE_CONVERT_CF,
- compiler.stack_assign(inputs[0]),
- compiler.stack_assign(outputs[0]));
+ NODE_CONVERT_CF,
+ compiler.stack_assign(inputs[0]),
+ compiler.stack_assign(outputs[0]));
}
void RGBToBWNode::compile(OSLCompiler& compiler)
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index b380117e729..fb32f1ba094 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -212,6 +212,9 @@ int SVMCompiler::stack_find_offset(int size)
while(i >= offset)
active_stack.users[i--] = 1;
+ if (offset == 255) {
+ abort();
+ }
return offset;
}
}