Skip to content

Commit 1702c80

Browse files
committed
Fix ModelSkin unit tests
1 parent 6bd45c1 commit 1702c80

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

radiantcore/decl/DeclarationFolderParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void DeclarationFolderParser::parse(std::istream& stream, const vfs::FileInfo& f
5252

5353
const auto& blockNode = static_cast<const parser::DefBlockSyntax&>(*node);
5454

55-
// Convert the incoming block to a DeclarationBlockSyntax
55+
// Convert the incoming block to a DeclarationBlockSource
5656
auto blockSyntax = createBlock(blockNode, fileInfo, modDir);
5757

5858
// Move the block in the correct bucket

radiantcore/skins/Doom3ModelSkin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ void Skin::foreachMatchingModel(const std::function<void(const std::string&)>& f
8585

8686
const std::vector<decl::ISkin::Remapping>& Skin::getAllRemappings()
8787
{
88+
ensureParsed();
8889
return _current->remaps;
8990
}
9091

test/Skin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ TEST_F(ModelSkinTest, ReloadDeclsRefreshesModelsUsingSignal)
524524

525525
// Inject a new block syntax into the existing skin declaration
526526
auto skin = GlobalModelSkinCache().findSkin("tile_skin");
527-
decl::DeclarationBlockSyntax syntax;
527+
decl::DeclarationBlockSource syntax;
528528

529529
syntax.name = skin->getDeclName();
530530
syntax.typeName = "skin";

0 commit comments

Comments
 (0)