diff options
| author | Magian <zang_magian@163.com> | 2024-05-14 15:32:47 +0800 |
|---|---|---|
| committer | Magian <zang_magian@163.com> | 2024-05-14 15:32:47 +0800 |
| commit | 8a92615ba0456844e6368f31be42ecf738ae88e7 (patch) | |
| tree | 77ca65eb4c09c91d5b7c6200a21a74debd891142 /scene/resources/shader.cpp | |
| parent | f91db3dc58f1d6a0cb63d591515183b5a45cd3ba (diff) | |
| download | redot-engine-8a92615ba0456844e6368f31be42ecf738ae88e7.tar.gz | |
Resolve conflict between shader uniform tooltips "/**" and general annotation "/**/".
Diffstat (limited to 'scene/resources/shader.cpp')
| -rw-r--r-- | scene/resources/shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index 0087a5e7f2..3bee6d10a4 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -156,7 +156,7 @@ void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_gr DocData::PropertyDoc prop_doc; prop_doc.name = "shader_parameter/" + pi.name; #ifdef MODULE_REGEX_ENABLED - const RegEx pattern("/\\*\\*([^*]|[\\r\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/\\s*uniform\\s+\\w+\\s+" + pi.name + "(?=[\\s:;=])"); + const RegEx pattern("/\\*\\*\\s([^*]|[\\r\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/\\s*uniform\\s+\\w+\\s+" + pi.name + "(?=[\\s:;=])"); Ref<RegExMatch> pattern_ref = pattern.search(code); if (pattern_ref != nullptr) { RegExMatch *match = pattern_ref.ptr(); |