diff options
Diffstat (limited to 'source/blender/compositor/nodes/COM_ZCombineNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_ZCombineNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index b30a603bcee..b61c018d029 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -26,13 +26,13 @@ #include "COM_MixOperation.h" #include "COM_SetValueOperation.h" -#include "DNA_material_types.h" // the ramp types +#include "DNA_material_types.h" /* the ramp types */ void ZCombineNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { if ((context.getRenderData()->scemode & R_FULL_SAMPLE) || this->getbNode()->custom2) { - ZCombineOperation *operation = NULL; + ZCombineOperation *operation = nullptr; if (this->getbNode()->custom1) { operation = new ZCombineAlphaOperation(); } |