Skip to content

Commit 89850d5

Browse files
committed
Merge pull request godotengine#91307 from akien-mga/shader-doc-comments-fixup
Don't run Shader doc comments logic outside the editor
2 parents f03301c + 5bd9f4d commit 89850d5

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

scene/resources/shader.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_gr
135135
class_doc.name = get_path();
136136
class_doc.is_script_doc = true;
137137
#endif
138+
138139
for (PropertyInfo &pi : local) {
139140
bool is_group = pi.usage == PROPERTY_USAGE_GROUP || pi.usage == PROPERTY_USAGE_SUBGROUP;
140141
if (!p_get_groups && is_group) {
@@ -152,6 +153,8 @@ void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_gr
152153
}
153154
#ifdef TOOLS_ENABLED
154155
if (Engine::get_singleton()->is_editor_hint()) {
156+
DocData::PropertyDoc prop_doc;
157+
prop_doc.name = "shader_parameter/" + pi.name;
155158
#ifdef MODULE_REGEX_ENABLED
156159
const RegEx pattern("/\\*\\*([^*]|[\\r\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/\\s*uniform\\s+\\w+\\s+" + pi.name + "(?=[\\s:;=])");
157160
Ref<RegExMatch> pattern_ref = pattern.search(code);
@@ -161,24 +164,17 @@ void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_gr
161164
Ref<RegExMatch> pattern_tip_ref = pattern_tip.search(match->get_string(0));
162165
RegExMatch *match_tip = pattern_tip_ref.ptr();
163166
const RegEx pattern_stripped("\\n\\s*\\*\\s*");
164-
DocData::PropertyDoc prop_doc;
165-
prop_doc.name = "shader_parameter/" + pi.name;
166167
prop_doc.description = pattern_stripped.sub(match_tip->get_string(1), "\n", true);
167-
class_doc.properties.push_back(prop_doc);
168168
}
169-
#else
170-
DocData::PropertyDoc prop_doc;
171-
prop_doc.name = "shader_parameter/" + pi.name;
172-
// prop_doc.description = "(Regex module is not enabled, shader parameter documentation will not be available.)";
173-
class_doc.properties.push_back(prop_doc);
174169
#endif
170+
class_doc.properties.push_back(prop_doc);
175171
}
176172
#endif
177173
p_params->push_back(pi);
178174
}
179175
}
180176
#ifdef TOOLS_ENABLED
181-
if (!class_doc.name.is_empty() && p_params) {
177+
if (Engine::get_singleton()->is_editor_hint() && !class_doc.name.is_empty() && p_params) {
182178
EditorHelp::get_doc_data()->add_doc(class_doc);
183179
}
184180
#endif

0 commit comments

Comments
 (0)