merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-19 19:26:14 +02:00
198 changed files with 2052 additions and 1128 deletions

View File

@@ -418,10 +418,11 @@ bool Thumbnail::hasProcParams () const
return pparamsValid;
}
void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow)
void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow, bool resetToDefault)
{
const bool needsReprocessing =
pparams.toneCurve != pp.toneCurve
resetToDefault
|| pparams.toneCurve != pp.toneCurve
|| pparams.labCurve != pp.labCurve
|| pparams.localContrast != pp.localContrast
|| pparams.rgbCurves != pp.rgbCurves