Merge branch 'dev' into nr-gain

2023-10-10 21:03:03 -07:00
parent 473d50a0a3 4c671fb661
commit ab8de06c66
201 changed files with 19647 additions and 25087 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -249,16 +249,12 @@ struct WBParamsEdited {
    bool equal;
    bool observer;
    bool tempBias;
-    bool itcwb_thres;
-    bool itcwb_precis;
-    bool itcwb_size;
-    bool itcwb_delta;
-    bool itcwb_fgreen;
    bool itcwb_rgreen;
    bool itcwb_nopurple;
-    bool itcwb_sorted;
-    bool itcwb_forceextra;
+    bool itcwb_alg;
+    bool itcwb_prim;
    bool itcwb_sampling;
+    bool itcwb_green;

 };

@@ -1533,6 +1529,7 @@ struct RAWParamsEdited {

 struct MetaDataParamsEdited {
    bool mode;
+    bool exifKeys;
 };

 struct FilmNegativeParamsEdited {