[Bf-blender-cvs] [2195a5eb2c2] sculpt-dev: Try to fix another linux compile error

[Joseph Eagar]

Commit: 2195a5eb2c2c47418a078f8a43d3e6593d4be1ff
Author: Joseph Eagar
Date:   Mon Sep 20 23:28:03 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB2195a5eb2c2c47418a078f8a43d3e6593d4be1ff

Try to fix another linux compile error

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

M	source/blender/blenloader/intern/versioning_cpp.cc
M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/blenloader/intern/versioning_cpp.cc b/source/blender/blenloader/intern/versioning_cpp.cc
index 3e49eb7cbbf..45a290513c6 100644
--- a/source/blender/blenloader/intern/versioning_cpp.cc
+++ b/source/blender/blenloader/intern/versioning_cpp.cc
@@ -8,7 +8,8 @@
 
 using namespace std;
 
-ATTR_NO_OPT extern "C" const char *sculpt_keymap_fix(const char *str)
+extern "C" {
+const char *sculpt_keymap_fix(const char *str)
 {
   basic_string repl = regex_replace(str, regex("unified_"), "");
   repl = regex_replace(repl, regex("size"), "radius");
@@ -70,3 +71,4 @@ ATTR_NO_OPT extern "C" const char *sculpt_keymap_fix(const char *str)
 
   return ret;
 }
+}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index bd40156f59b..dae864fda91 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -149,8 +149,19 @@ ATTR_NO_OPT float SCULPT_get_float(const SculptSession *ss,
     return BKE_brush_channelset_get_float(
         ss->cache->channels_final, idname, &ss->cache->input_mapping);
   }
+  else if (br && sd && br->channels && sd->channels) {
+    return BKE_brush_channelset_get_final_float(
+        br->channels, sd->channels, idname, &ss->cache->input_mapping);
+  }
+  else if (br && br->channels) {
+    return BKE_brush_channelset_get_float(br->channels, idname, &ss->cache->input_mapping);
+  }
+  else if (sd && sd->channels) {
+    return BKE_brush_channelset_get_float(sd->channels, idname, &ss->cache->input_mapping);
+  }
   else {
-    return BKE_brush_channelset_get_final_float(br->channels, sd->channels, idname, NULL);
+    // eek!
+    return 0.0f;
   }
 }
 
@@ -163,8 +174,19 @@ ATTR_NO_OPT int SCULPT_get_int(const SculptSession *ss,
     return BKE_brush_channelset_get_int(
         ss->cache->channels_final, idname, &ss->cache->input_mapping);
   }
+  else if (br && br->channels && sd && sd->channels) {
+    return BKE_brush_channelset_get_final_int(
+        br->channels, sd->channels, idname, &ss->cache->input_mapping);
+  }
+  else if (br && br->channels) {
+    return BKE_brush_channelset_get_int(br->channels, idname, &ss->cache->input_mapping);
+  }
+  else if (sd && sd->channels) {
+    return BKE_brush_channelset_get_int(sd->channels, idname, &ss->cache->input_mapping);
+  }
   else {
-    return BKE_brush_channelset_get_final_int(br->channels, sd->channels, idname, NULL);
+    // eek!
+    return 0;
   }
 }