Another build conflict fix

Signed-off-by: falkTX <falktx@falktx.com>

plugins/Makefile

@@ -323,7 +323,7 @@ PLUGIN_FILES += $(filter-out AS/src/AS.cpp,$(wildcard AS/src/*.cpp))
 PLUGIN_FILES += AS/freeverb/revmodel.cpp
 
 # modules/types which are present in other plugins
-AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA YellowRedLight allpass comb revmodel
+AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA WaveShaper YellowRedLight allpass comb revmodel
 AS_CUSTOM_PER_FILE = NumberDisplayWidget
 
 # --------------------------------------------------------------

plugins/plugins.cpp

@@ -80,11 +80,13 @@ extern Model* modelBlank;
 // AS
 #define modelADSR modelASADSR
 #define modelVCA modelASVCA
+#define modelWaveShaper modelASWaveShaper
 #define LedLight ASLedLight
 #define YellowRedLight ASYellowRedLight
 #include "AS/src/AS.hpp"
 #undef modelADSR
 #undef modelVCA
+#undef modelWaveShaper
 #undef LedLight
 #undef YellowRedLight
 
@@ -1125,6 +1127,7 @@ static void initStatic__AS()
     {
 #define modelADSR modelASADSR
 #define modelVCA modelASVCA
+#define modelWaveShaper modelASWaveShaper
         //OSCILLATORS
         p->addModel(modelSineOsc);
         p->addModel(modelSawOsc);
@@ -1175,6 +1178,7 @@ static void initStatic__AS()
         p->addModel(modelBlankPanelSpecial);
 #undef modelADSR
 #undef modelVCA
+#undef modelWaveShaper
     }
 }