diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
| commit | 9324503b84a06f76af072131da947547c84698ed (patch) | |
| tree | b9336118dcf8df9e9ca4888d9ee3ac9fec2c2798 /source/blender/compositor/operations/COM_ZCombineOperation.h | |
| parent | 234c338655fc49efef0b7ffe0ef6736e8630411a (diff) | |
| parent | 958cf139f6587df631944f6ec0fcb4111c7e58fa (diff) | |
Merge with trunk r48602
Diffstat (limited to 'source/blender/compositor/operations/COM_ZCombineOperation.h')
| -rw-r--r-- | source/blender/compositor/operations/COM_ZCombineOperation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index 2ade3f599ad..422a946b98f 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -26,8 +26,8 @@ /** - * this program converts an input colour to an output value. - * it assumes we are in sRGB colour space. + * this program converts an input color to an output value. + * it assumes we are in sRGB color space. */ class ZCombineOperation : public NodeOperation { protected: |