Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2022-04-14 21:53:49 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2022-04-14 21:54:09 +0300
commit48d2f536e182468c26a81ec2c2af2638e6768bb0 (patch)
treeff536bb1b4df5cb98fc3821fb5cbce80c9ad0643
parent05715eaea144b3812c2a788e5ef413a5aa601a06 (diff)
Fix crash when loading Blender due to recent change
Issue introduced in {rB80859a6cb272} Only seen on Windows. The `keyword_parse` lambda function code did not consider `\r` as a whitespace char, resulting in a wrong parse. (More investigation needs to be done).
-rw-r--r--source/blender/gpu/intern/gpu_shader_dependency.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc
index 7ee64d7e80f..d1242e540fc 100644
--- a/source/blender/gpu/intern/gpu_shader_dependency.cc
+++ b/source/blender/gpu/intern/gpu_shader_dependency.cc
@@ -290,7 +290,7 @@ struct GPUSource {
{
const StringRefNull input = source;
- const char whitespace_chars[] = " \n\t";
+ const char whitespace_chars[] = " \r\n\t";
auto function_parse = [&](const StringRef &input,
int64_t &cursor,