blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T98268: replace string node des not handle empty strings correctly 

Just use an existing function from blenlib instead of implementing a new version.
This commit is contained in:
Jacques Lucke 2022-05-24 10:21:02 +02:00
parent 2ea6a0dd4d
commit 174c3ffb4a
Notes: blender-bot 2023-02-14 08:33:26 +01:00 
Referenced by issue #98268, Replace String geometry node does not handle empty strings correctly
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/nodes/function/nodes/node_fn_replace_string.cc
View File

@ -15,19 +15,17 @@ static void fn_node_replace_string_declare(NodeDeclarationBuilder &b)
b.add_output<decl::String>(N_("String"));
}
static std::string replace_all(std::string str, const std::string &from, const std::string &to)
static std::string replace_all(const StringRefNull str,
const StringRefNull from,
const StringRefNull to)
{
if (from.length() <= 0) {
if (from.is_empty()) {
return str;
}
const size_t step = to.length() > 0 ? to.length() : 1;
size_t offset = 0;
while ((offset = str.find(from, offset)) != std::string::npos) {
str.replace(offset, from.length(), to);
offset += step;
}
return str;
char *new_str_ptr = BLI_str_replaceN(str.c_str(), from.c_str(), to.c_str());
std::string new_str{new_str_ptr};
MEM_freeN(new_str_ptr);
return new_str;
}
static void fn_node_replace_string_build_multi_function(NodeMultiFunctionBuilder &builder)