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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-13 00:15:22 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-13 00:15:22 +0400
commit99e97afbe398fe44ceae6a85039a80c32b5a4606 (patch)
tree8c934c3e95966d016000f43891d3908bd0ec27c7 /source/blender/compositor
parent50262b5ea9f107930c0f08913d0de307c4edecc0 (diff)
Fix #35586: add an option to the Z Combine compositing node to disable the Z
buffer antialiasing that was restored in 2.67 after it was missing in the new compositor implementation. This option tends to make results worse rather then better for Cycles renders, but is useful for Blender internal. Their Z-buffers look quite different for antialiasing, and I'd rather not change either.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/nodes/COM_ZCombineNode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
index 95f06e350b1..b48d974e893 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
@@ -34,7 +34,7 @@
void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
{
- if (context->getRenderData()->scemode & R_FULL_SAMPLE) {
+ if ((context->getRenderData()->scemode & R_FULL_SAMPLE) || this->getbNode()->custom2) {
if (this->getOutputSocket(0)->isConnected()) {
ZCombineOperation *operation = NULL;
if (this->getbNode()->custom1) {