[Bf-blender-cvs] [562723b0804] temp_test_sc_keymap: More linux fixes

[Joseph Eagar]

Commit: 562723b0804a1bd1d280c34e769351981b3afe96
Author: Joseph Eagar
Date:   Tue Sep 21 00:03:32 2021 -0700
Branches: temp_test_sc_keymap
https://developer.blender.org/rB562723b0804a1bd1d280c34e769351981b3afe96

More linux fixes

===================================================================

M	source/blender/blenkernel/intern/brush_engine_presets.c
M	source/blender/blenloader/intern/versioning_cpp.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/brush_engine_presets.c b/source/blender/blenkernel/intern/brush_engine_presets.c
index cd8baad04eb..a349679eaff 100644
--- a/source/blender/blenkernel/intern/brush_engine_presets.c
+++ b/source/blender/blenkernel/intern/brush_engine_presets.c
@@ -236,7 +236,7 @@ BrushChannelType brush_builtin_channels[] = {
     .min = 0.0001f,
     .max = 1.0f,
     .fvalue = 1.0f,
-    .soft_min = 0.1f,
+    .soft_min = 0.0f,
     .soft_max = 1.0f,
     .mappings = {
         .pressure = {.curve = CURVE_PRESET_LINE, .factor = 1.0, .min = 0.0f, .max = 1.0f, .enabled = false},
diff --git a/source/blender/blenloader/intern/versioning_cpp.cc b/source/blender/blenloader/intern/versioning_cpp.cc
index 45a290513c6..1ecdcb6525b 100644
--- a/source/blender/blenloader/intern/versioning_cpp.cc
+++ b/source/blender/blenloader/intern/versioning_cpp.cc
@@ -14,9 +14,9 @@ const char *sculpt_keymap_fix(const char *str)
   basic_string repl = regex_replace(str, regex("unified_"), "");
   repl = regex_replace(repl, regex("size"), "radius");
 
-  regex pat1(R"'(tool_settings.sculpt.brush.([a-zA-Z0-9_]+)$)'", regex::flag_type::ECMAScript);
-  regex pat2(R"'(tool_settings.paint_settings.([a-zA-Z0-9_]+)$)'", regex::flag_type::ECMAScript);
-  regex pat3(R"'(tool_settings.paint_settings.use_([a-zA-Z_]+)$)'", regex::flag_type::ECMAScript);
+  regex pat1(R"'(tool_settings.sculpt.brush.([a-zA-Z0-9_]+)$)'", regex::flag_type::extended);
+  regex pat2(R"'(tool_settings.paint_settings.([a-zA-Z0-9_]+)$)'", regex::flag_type::extended);
+  regex pat3(R"'(tool_settings.paint_settings.use_([a-zA-Z_]+)$)'", regex::flag_type::extended);
 
   basic_string propname = "";
   basic_string tmp = regex_replace(repl, regex("use_"), "");