Skip to content

Commit 7ec9258

Browse files
committed
fix regex for shader define: must have at least one whitespace (#7754)
# Objective - Nothing render ``` ERROR bevy_render::render_resource::pipeline_cache: failed to process shader: Invalid shader def definition for '_import_path': bevy_pbr ``` ## Solution - Fix define regex so that it must have one whitespace after `define`
1 parent b056475 commit 7ec9258

File tree

1 file changed

+1
-1
lines changed
  • crates/bevy_render/src/render_resource

1 file changed

+1
-1
lines changed

crates/bevy_render/src/render_resource/shader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ impl Default for ShaderProcessor {
407407
else_ifdef_regex: Regex::new(r"^\s*#\s*else\s+ifdef\s*([\w|\d|_]+)").unwrap(),
408408
else_regex: Regex::new(r"^\s*#\s*else").unwrap(),
409409
endif_regex: Regex::new(r"^\s*#\s*endif").unwrap(),
410-
define_regex: Regex::new(r"^\s*#\s*define\s*([\w|\d|_]+)\s*([-\w|\d]+)?").unwrap(),
410+
define_regex: Regex::new(r"^\s*#\s*define\s+([\w|\d|_]+)\s*([-\w|\d]+)?").unwrap(),
411411
def_regex: Regex::new(r"#\s*([\w|\d|_]+)").unwrap(),
412412
def_regex_delimited: Regex::new(r"#\s*\{([\w|\d|_]+)\}").unwrap(),
413413
}

0 commit comments

Comments
 (0)