# HG changeset patch
# User Chris Cannam
# Date 1470405264 -3600
# Node ID 17f999cd0a222c46ec58832e85813173f57c6534
# Parent  6eef0330ef122d485339361f89329b29f1667fef
Since 1d317e717fe4 we no longer want to fft scale in hybrid mode. (This might also restore compatibility with Tony and prior SV save sessions -- test this.)

diff -r 6eef0330ef12 -r 17f999cd0a22 layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Fri Aug 05 14:36:28 2016 +0100
+++ b/layer/SpectrogramLayer.cpp	Fri Aug 05 14:54:24 2016 +0100
@@ -1468,7 +1468,8 @@
         params.scaleFactor = 1.0;
         params.colourRotation = m_colourRotation;
 
-        if (m_colourScale != ColourScaleType::Phase) {
+        if (m_colourScale != ColourScaleType::Phase &&
+            m_normalization != ColumnNormalization::Hybrid) {
             params.scaleFactor *= 2.f / float(getFFTSize());
         }