diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
| commit | a92557f77b46784bb2631981fbf9fd67468419d1 (patch) | |
| tree | c7c1e0610d6b76aac0db873cad78e54c3a8f7f3e /source/blender/compositor | |
| parent | 2d2875fc158d2fbcade1d335f2ca3921cb65d87e (diff) | |
| parent | 598216c36e2461ddcaa7dd72e4d50691710c4647 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_ConvertOperation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cpp b/source/blender/compositor/operations/COM_ConvertOperation.cpp index 327015c1139..8e79931d6f0 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertOperation.cpp @@ -164,15 +164,15 @@ ConvertRGBToYCCOperation::ConvertRGBToYCCOperation() : ConvertBaseOperation() void ConvertRGBToYCCOperation::setMode(int mode) { switch (mode) { - case 1: - this->m_mode = BLI_YCC_ITU_BT709; + case 0: + this->m_mode = BLI_YCC_ITU_BT601; break; case 2: this->m_mode = BLI_YCC_JFIF_0_255; break; - case 0: + case 1: default: - this->m_mode = BLI_YCC_ITU_BT601; + this->m_mode = BLI_YCC_ITU_BT709; break; } } @@ -202,15 +202,15 @@ ConvertYCCToRGBOperation::ConvertYCCToRGBOperation() : ConvertBaseOperation() void ConvertYCCToRGBOperation::setMode(int mode) { switch (mode) { - case 1: - this->m_mode = BLI_YCC_ITU_BT709; + case 0: + this->m_mode = BLI_YCC_ITU_BT601; break; case 2: this->m_mode = BLI_YCC_JFIF_0_255; break; - case 0: + case 1: default: - this->m_mode = BLI_YCC_ITU_BT601; + this->m_mode = BLI_YCC_ITU_BT709; break; } } |