Skip to content

Commit 468d130

Browse files
fix(m2): remove redundant version check in chunked parse
Fixed clippy error 'if_same_then_else' by removing redundant version check that was checking same condition as flag check. The USE_TEXTURE_COMBINERS flag alone determines whether texture_combiner_combos field exists, regardless of M2 version.
1 parent 092fef0 commit 468d130

File tree

1 file changed

+1
-3
lines changed
  • file-formats/graphics/wow-m2/src

1 file changed

+1
-3
lines changed

file-formats/graphics/wow-m2/src/model.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,9 +3207,7 @@ impl M2Model {
32073207
None
32083208
};
32093209

3210-
let texture_combiner_combos = if m2_version >= M2Version::Cataclysm {
3211-
Some(M2Array::parse(chunk_inner)?)
3212-
} else if flags.contains(M2ModelFlags::USE_TEXTURE_COMBINERS) {
3210+
let texture_combiner_combos = if flags.contains(M2ModelFlags::USE_TEXTURE_COMBINERS) {
32133211
Some(M2Array::parse(chunk_inner)?)
32143212
} else {
32153213
None

0 commit comments

Comments
 (0)