Multiple assets with the same name cannot be added to packs
This commit is contained in:
parent
8bb59e7b6c
commit
cd41123beb
@ -100,6 +100,7 @@ int main(int argc, char* argv[]) {
|
|||||||
continue;
|
continue;
|
||||||
std::string filename = currDir.path().filename().string().append(".nfpack");
|
std::string filename = currDir.path().filename().string().append(".nfpack");
|
||||||
Log("Creating pack \"" + filename + (std::string)"\"");
|
Log("Creating pack \"" + filename + (std::string)"\"");
|
||||||
|
std::vector<std::string> packFilenames;
|
||||||
std::string currFileExtension;
|
std::string currFileExtension;
|
||||||
std::string currFileContents;
|
std::string currFileContents;
|
||||||
std::stringstream out;
|
std::stringstream out;
|
||||||
@ -148,6 +149,10 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
currFileContents += '\n' + mtlContents;
|
currFileContents += '\n' + mtlContents;
|
||||||
}
|
}
|
||||||
|
for (std::string& currFilename : packFilenames)
|
||||||
|
if (relative.filename().string() == currFilename)
|
||||||
|
Error("Duplicate asset name \"" + relative.filename().string() + (std::string)"\" in pack!");
|
||||||
|
packFilenames.push_back(relative.filename().string());
|
||||||
if (out.rdbuf()->in_avail() != 0)
|
if (out.rdbuf()->in_avail() != 0)
|
||||||
out << "\n";
|
out << "\n";
|
||||||
out << "#NFASSET " + curr.path().filename().string();
|
out << "#NFASSET " + curr.path().filename().string();
|
||||||
|
Reference in New Issue
Block a user