Skip to content

Commit 61c3321

Browse files
committed
Merge branch 'feat/script-systems' of github.com:makspll/bevy_mod_scripting into feat/script-systems
2 parents eb644ca + 7d9df09 commit 61c3321

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

crates/bevy_mod_scripting_core/src/reflection_extensions.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,12 @@ impl<T: PartialReflect + ?Sized> PartialReflectExt for T {
138138

139139
fn as_option(&self) -> Result<Option<&dyn PartialReflect>, InteropError> {
140140
if let bevy::reflect::ReflectRef::Enum(e) = self.reflect_ref() {
141-
if let Some(field) = e.field_at(0) {
142-
return Ok(Some(field));
143-
} else {
144-
return Ok(None);
141+
if e.is_type(Some("core"), "Option") {
142+
if let Some(field) = e.field_at(0) {
143+
return Ok(Some(field));
144+
} else {
145+
return Ok(None);
146+
}
145147
}
146148
}
147149

@@ -535,7 +537,13 @@ mod test {
535537

536538
#[test]
537539
fn test_as_option_none() {
540+
#[derive(Reflect)]
541+
enum Test {
542+
Unit,
543+
}
544+
538545
assert!(None::<i32>.as_option().unwrap().is_none());
546+
assert!(Test::Unit.as_option().is_err())
539547
}
540548

541549
#[test]

release-plz.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ commit_parsers = [
2121
{ message = "^test.*", skip = true },
2222
{ message = "^docs.*", skip = true },
2323
{ message = ".*[SKIP_CHANGELOG].*", skip = true },
24-
{ message = "^feat.*", group = "added" },
25-
{ message = "^changed.*", group = "changed" },
26-
{ message = "^deprecated.*", group = "deprecated" },
27-
{ message = "^fix.*", group = "fixed" },
28-
{ message = "^security.*", group = "security" },
29-
{ message = "^refactor.*", group = "refactor" },
24+
{ message = "^feat", group = "added" },
25+
{ message = "^changed", group = "changed" },
26+
{ message = "^deprecated", group = "deprecated" },
27+
{ message = "^fix", group = "fixed" },
28+
{ message = "^security", group = "security" },
29+
{ message = "^refactor", group = "refactor" },
3030
{ message = "^.*", group = "other" },
3131
]
3232

0 commit comments

Comments
 (0)