[Bf-blender-cvs] [48d2f536e18] master: Fix crash when loading Blender due to recent change

Germano Cavalcante noreply at git.blender.org
Thu Apr 14 20:54:43 CEST 2022


Commit: 48d2f536e182468c26a81ec2c2af2638e6768bb0
Author: Germano Cavalcante
Date:   Thu Apr 14 15:53:49 2022 -0300
Branches: master
https://developer.blender.org/rB48d2f536e182468c26a81ec2c2af2638e6768bb0

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).

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

M	source/blender/gpu/intern/gpu_shader_dependency.cc

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

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,



More information about the Bf-blender-cvs mailing list