blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Try to fix another linux compile error

This commit is contained in:
Joseph Eagar 2021-09-20 23:28:03 -07:00
parent 4307c0eb68
commit 2195a5eb2c
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/versioning_cpp.cc
View File

@ -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;
}
}

26
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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;
}
}