From 4dbfbc4b0338076e3fa9ac86bd1936027c8f11a8 Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: Sep 13 2016 04:52:34 +0000 Subject: fix version numbers --- diff --git a/toonz/sources/tcleanupper/tcleanupper.cpp b/toonz/sources/tcleanupper/tcleanupper.cpp index e133730..b750387 100644 --- a/toonz/sources/tcleanupper/tcleanupper.cpp +++ b/toonz/sources/tcleanupper/tcleanupper.cpp @@ -63,8 +63,8 @@ inline ostream &operator<<(ostream &out, const TFilePath &fp) { namespace { const char *applicationName = "OpenToonz"; -const char *applicationVersion = "1.0"; -const char *applicationFullName = "OpenToonz 1.0"; +const char *applicationVersion = "1.1"; +const char *applicationFullName = "OpenToonz 1.1"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; @@ -625,6 +625,14 @@ int main(int argc, char *argv[]) { /*-- CleanupSettingsファイルパスを直接入力した場合 --*/ else { 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ファイルが有るかチェック -*/ TFilePath tifImagePath = fp.withType("tif"); std::wcout << L"tifImagePath : " << tifImagePath.getWideString() diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index 676857a..1eb9d32 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -104,8 +104,8 @@ namespace { // const char *applicationName = "OpenToonz"; -const char *applicationVersion = "1.0"; -const char *applicationFullName = "OpenToonz 1.0"; +const char *applicationVersion = "1.1"; +const char *applicationFullName = "OpenToonz 1.1"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; diff --git a/toonz/sources/tconverter/tconverter.cpp b/toonz/sources/tconverter/tconverter.cpp index 31ae9c0..8b437aa 100644 --- a/toonz/sources/tconverter/tconverter.cpp +++ b/toonz/sources/tconverter/tconverter.cpp @@ -37,7 +37,7 @@ typedef QualifierT FilePathQualifier; #define RENDER_LICENSE_NOT_FOUND 888 -const char *applicationVersion = "1.0"; +const char *applicationVersion = "1.1"; const char *applicationName = "OpenToonz"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ";