From 2c4367441cf00442b9e841d98feefb99fc06ab75 Mon Sep 17 00:00:00 2001 From: Yuri Roubinsky Date: Sat, 1 Feb 2020 12:34:02 +0300 Subject: Prevent shader crash when name conflict with "dus" and "__" occured --- servers/visual/shader_language.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index d3ecdf4e59..14d2f6d086 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -662,6 +662,8 @@ ShaderLanguage::Token ShaderLanguage::_get_token() { idx++; } + str = str.replace("dus_", "_"); + return _make_token(TK_IDENTIFIER, str); } -- cgit v1.2.3