diff options
author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/compositor/operations/COM_MixOperation.h | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
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 |