Merge with develop

This commit is contained in:
kervala 2016-01-18 21:48:31 +01:00
commit 9f22359d02

View file

@ -33,11 +33,11 @@ int main(int argc, char *argv[])
args.addArg("d", "dst", "destination", "Destination directory path"); args.addArg("d", "dst", "destination", "Destination directory path");
args.addArg("", "dependlog", "log", "Dependencies log path"); args.addArg("", "dependlog", "log", "Dependencies log path");
args.addArg("", "errorlog", "log", "Errors log path"); args.addArg("", "errorlog", "log", "Errors log path");
args.addArg("filename", "Filename of 3D model to convert"); args.addAdditionalArg("input", "Filename of 3D model to convert", false);
if (!args.parse(argc, argv)) return EXIT_SUCCESS; if (!args.parse(argc, argv)) return EXIT_SUCCESS;
const std::vector<std::string> &filePathes = args.getRequiredArg(); const std::vector<std::string> &filePathes = args.getAdditionalArg("input");
NL3D::CScene::registerBasics(); NL3D::CScene::registerBasics();
NL3D::registerSerial3d(); NL3D::registerSerial3d();