Merge from branch 'dev'

2020-05-04 14:07:45 -07:00
parent 357cf5b96a 1beb3c91b4
commit fb5094b6f9
282 changed files with 18917 additions and 9911 deletions
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -90,6 +90,7 @@ enum {
    ADDSET_WA_SKINPROTECT,
    ADDSET_WA_THRR,
    ADDSET_WA_THRRH,
+    ADDSET_WA_RADIUS,
    ADDSET_WA_THRES,
    ADDSET_WA_THRESHOLD,
    ADDSET_WA_THRESHOLD2,
@@ -107,6 +108,8 @@ enum {
    ADDSET_WA_EDGEDETECTTHR,
    ADDSET_WA_EDGEDETECTTHR2,
    ADDSET_WA_TMRS,
+    ADDSET_WA_EDGS,
+    ADDSET_WA_SCALE,
    ADDSET_WA_GAMMA,
    ADDSET_RETI_STR,
    ADDSET_RETI_NEIGH,