[Bf-blender-cvs] [763cd2e0bee] master: Cleanup: fix compiler warning
Brecht Van Lommel
noreply at git.blender.org
Tue Dec 7 20:23:26 CET 2021
Commit: 763cd2e0beead45d331ea0b781c2c0cec0f71242
Author: Brecht Van Lommel
Date: Tue Dec 7 19:19:55 2021 +0100
Branches: master
https://developer.blender.org/rB763cd2e0beead45d331ea0b781c2c0cec0f71242
Cleanup: fix compiler warning
===================================================================
M intern/cycles/util/path.cpp
===================================================================
diff --git a/intern/cycles/util/path.cpp b/intern/cycles/util/path.cpp
index 243b3187f2e..e27c929fba9 100644
--- a/intern/cycles/util/path.cpp
+++ b/intern/cycles/util/path.cpp
@@ -766,7 +766,6 @@ static string path_source_replace_includes_recursive(const string &source,
static string path_source_handle_preprocessor(const string &preprocessor_line,
const string &source_filepath,
- const size_t line_number,
SourceReplaceState *state)
{
string result = preprocessor_line;
@@ -857,8 +856,7 @@ static string path_source_replace_includes_recursive(const string &_source,
if (ch == '\n') {
if (inside_preprocessor) {
- string block = path_source_handle_preprocessor(
- preprocessor_line, source_filepath, line_number, state);
+ string block = path_source_handle_preprocessor(preprocessor_line, source_filepath, state);
if (!block.empty()) {
result += block;
@@ -899,8 +897,7 @@ static string path_source_replace_includes_recursive(const string &_source,
result.append(source, token_start, token_length);
}
if (inside_preprocessor) {
- result += path_source_handle_preprocessor(
- preprocessor_line, source_filepath, line_number, state);
+ result += path_source_handle_preprocessor(preprocessor_line, source_filepath, state);
}
/* Store result for further reuse. */
state->processed_files[source_filepath] = result;
More information about the Bf-blender-cvs
mailing list