diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 11:04:57 +0300 |
commit | 7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch) | |
tree | 7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/compositor/operations/COM_MixOperation.h | |
parent | 21fec951396982807d9cbe3852c58dbc898a809c (diff) | |
parent | 91694b9b58ab953f3b313be9389cc1303e472fc2 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/compositor/operations/COM_MixOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_MixOperation.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_MixOperation.h b/source/blender/compositor/operations/COM_MixOperation.h index cea0e59b541..e597e8af63a 100644 --- a/source/blender/compositor/operations/COM_MixOperation.h +++ b/source/blender/compositor/operations/COM_MixOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MIXOPERATION_H__ -#define __COM_MIXOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -193,5 +193,3 @@ class MixValueOperation : public MixBaseOperation { MixValueOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif |