merge with dev

This commit is contained in:
Desmis
2017-11-19 09:08:45 +01:00
51 changed files with 2253 additions and 409 deletions

View File

@@ -365,6 +365,14 @@ public:
};
class FattalToneMappingParamsEdited {
public:
bool enabled;
bool threshold;
bool amount;
};
class SHParamsEdited
{
@@ -909,6 +917,7 @@ public:
DefringeParamsEdited defringe;
DirPyrDenoiseParamsEdited dirpyrDenoise;
EPDParamsEdited epd;
FattalToneMappingParamsEdited fattal;
ImpulseDenoiseParamsEdited impulseDenoise;
SHParamsEdited sh;
CropParamsEdited crop;