diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-07 03:46:48 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-07 03:46:48 +0400 |
commit | b7b50298148ef502d14143b0a5fa01dfac2ecce4 (patch) | |
tree | 7c47cc7777b79bb375bc2f939c34233e6671e10d /source/blender/compositor/operations/COM_MixMultiplyOperation.h | |
parent | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (diff) | |
parent | 3a0593cc3d5de33248b3a7b913a45729c37dc1b4 (diff) |
Merged changes in the trunk up to revision 48695.
Diffstat (limited to 'source/blender/compositor/operations/COM_MixMultiplyOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_MixMultiplyOperation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.h b/source/blender/compositor/operations/COM_MixMultiplyOperation.h index 2c12854bfa6..4c89a8f2957 100644 --- a/source/blender/compositor/operations/COM_MixMultiplyOperation.h +++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.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 MixMultiplyOperation : public MixBaseOperation { public: |