fix version numbers
This commit is contained in:
parent
a949b15c9e
commit
4dbfbc4b03
3 changed files with 13 additions and 5 deletions
|
@ -63,8 +63,8 @@ inline ostream &operator<<(ostream &out, const TFilePath &fp) {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
const char *applicationName = "OpenToonz";
|
const char *applicationName = "OpenToonz";
|
||||||
const char *applicationVersion = "1.0";
|
const char *applicationVersion = "1.1";
|
||||||
const char *applicationFullName = "OpenToonz 1.0";
|
const char *applicationFullName = "OpenToonz 1.1";
|
||||||
const char *rootVarName = "TOONZROOT";
|
const char *rootVarName = "TOONZROOT";
|
||||||
const char *systemVarPrefix = "TOONZ";
|
const char *systemVarPrefix = "TOONZ";
|
||||||
|
|
||||||
|
@ -625,6 +625,14 @@ int main(int argc, char *argv[]) {
|
||||||
/*-- CleanupSettingsファイルパスを直接入力した場合 --*/
|
/*-- CleanupSettingsファイルパスを直接入力した場合 --*/
|
||||||
else {
|
else {
|
||||||
try {
|
try {
|
||||||
|
TProjectManager *pm = TProjectManager::instance();
|
||||||
|
TProjectP sceneProject = pm->loadSceneProject(fp);
|
||||||
|
if (!sceneProject) {
|
||||||
|
cerr << "can't open project." << endl;
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
scene->setProject(sceneProject.getPointer());
|
||||||
|
|
||||||
/*- CleanupSettingsファイルに対応するTIFファイルが有るかチェック -*/
|
/*- CleanupSettingsファイルに対応するTIFファイルが有るかチェック -*/
|
||||||
TFilePath tifImagePath = fp.withType("tif");
|
TFilePath tifImagePath = fp.withType("tif");
|
||||||
std::wcout << L"tifImagePath : " << tifImagePath.getWideString()
|
std::wcout << L"tifImagePath : " << tifImagePath.getWideString()
|
||||||
|
|
|
@ -104,8 +104,8 @@ namespace {
|
||||||
//
|
//
|
||||||
|
|
||||||
const char *applicationName = "OpenToonz";
|
const char *applicationName = "OpenToonz";
|
||||||
const char *applicationVersion = "1.0";
|
const char *applicationVersion = "1.1";
|
||||||
const char *applicationFullName = "OpenToonz 1.0";
|
const char *applicationFullName = "OpenToonz 1.1";
|
||||||
const char *rootVarName = "TOONZROOT";
|
const char *rootVarName = "TOONZROOT";
|
||||||
const char *systemVarPrefix = "TOONZ";
|
const char *systemVarPrefix = "TOONZ";
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ typedef QualifierT<TFilePath> FilePathQualifier;
|
||||||
|
|
||||||
#define RENDER_LICENSE_NOT_FOUND 888
|
#define RENDER_LICENSE_NOT_FOUND 888
|
||||||
|
|
||||||
const char *applicationVersion = "1.0";
|
const char *applicationVersion = "1.1";
|
||||||
const char *applicationName = "OpenToonz";
|
const char *applicationName = "OpenToonz";
|
||||||
const char *rootVarName = "TOONZROOT";
|
const char *rootVarName = "TOONZROOT";
|
||||||
const char *systemVarPrefix = "TOONZ";
|
const char *systemVarPrefix = "TOONZ";
|
||||||
|
|
Loading…
Reference in a new issue