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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-14 03:31:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-14 03:31:47 +0400
commitbde7e6c96b9e180b293ee6e49ab813a30fac0635 (patch)
treecf9f09aa0b3bb0528553546674269f0e5e96bd93 /source/blender/compositor/operations/COM_ZCombineOperation.h
parent906b9e0584b93094b1c45514fbf6fd8c62e6d015 (diff)
stule cleanup: node headers
Diffstat (limited to 'source/blender/compositor/operations/COM_ZCombineOperation.h')
-rw-r--r--source/blender/compositor/operations/COM_ZCombineOperation.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h
index f9de916fce0..56ad950a3aa 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.h
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.h
@@ -26,9 +26,9 @@
/**
- * this program converts an input colour to an output value.
- * it assumes we are in sRGB colour space.
- */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
class ZCombineOperation : public NodeOperation {
protected:
SocketReader *image1Reader;
@@ -37,21 +37,21 @@ protected:
SocketReader *depth2Reader;
public:
/**
- * Default constructor
- */
+ * Default constructor
+ */
ZCombineOperation();
void initExecution();
void deinitExecution();
/**
- * the inner loop of this program
- */
- void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+ * the inner loop of this program
+ */
+ void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
};
-class ZCombineAlphaOperation: public ZCombineOperation {
- void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+class ZCombineAlphaOperation : public ZCombineOperation {
+ void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
};
#endif