Commit: 39d24ffccb79d5b09a98866357bd9b8e3f77d379
Author: Sergey Sharybin
Date: Tue Dec 11 12:57:57 2018 +0100
Branches: master
https://developer.blender.org/rB39d24ffccb79d5b09a98866357bd9b8e3f77d379
Cycles: Cleanup, indentation
===================================================================
M intern/cycles/render/nodes.cpp
M intern/cycles/render/svm.cpp
===================================================================
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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
