Merge remote-tracking branch 'origin/master' into revert_schematic_output_port
This commit is contained in:
commit
49ff76e3d3
2 changed files with 12 additions and 5 deletions
15
README.md
15
README.md
|
@ -1,8 +1,10 @@
|
||||||
# OpenToonz ([日本語](./doc/README_ja.md))
|
# OpenToonz
|
||||||
|
|
||||||
|
[日本語](./doc/README_ja.md)
|
||||||
|
|
||||||
## What is OpenToonz?
|
## What is OpenToonz?
|
||||||
|
|
||||||
OpenToonz is a 2D animation suite published by
|
OpenToonz is a 2D animation software published by
|
||||||
[DWANGO](http://dwango.co.jp/english/). It is based on **Toonz Studio
|
[DWANGO](http://dwango.co.jp/english/). It is based on **Toonz Studio
|
||||||
Ghibli Version**, originally developed in Italy by
|
Ghibli Version**, originally developed in Italy by
|
||||||
[Digital Video, Inc.](http://www.toonz.com/), and customized by
|
[Digital Video, Inc.](http://www.toonz.com/), and customized by
|
||||||
|
@ -10,17 +12,22 @@ Ghibli Version**, originally developed in Italy by
|
||||||
|
|
||||||
## Program Requirements
|
## Program Requirements
|
||||||
|
|
||||||
Please refer to the OpenToonz site at <https://opentoonz.github.io>.
|
Please refer to the OpenToonz site at <https://opentoonz.github.io/e/index.html>.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
Please download and install OpenToonz from the installers at <https://opentoonz.github.io>.
|
Please download and install OpenToonz from the installers at <https://opentoonz.github.io/e/index.html>.
|
||||||
|
|
||||||
## How to Build Locally
|
## How to Build Locally
|
||||||
|
|
||||||
- [Windows](./doc/how_to_build_win.md)
|
- [Windows](./doc/how_to_build_win.md)
|
||||||
- [OS X](./doc/how_to_build_macosx.md)
|
- [OS X](./doc/how_to_build_macosx.md)
|
||||||
|
|
||||||
|
## Community
|
||||||
|
|
||||||
|
- To share tips or to troubleshoot, join the [Google OpenToonz Users forum](https://groups.google.com/forum/#!forum/opentoonz_en)
|
||||||
|
- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/opentoonz/opentoonz/issues) and post there.
|
||||||
|
|
||||||
## Licensing
|
## Licensing
|
||||||
|
|
||||||
- Files outside of the `thirdparty` directory are based on the Modified BSD License.
|
- Files outside of the `thirdparty` directory are based on the Modified BSD License.
|
||||||
|
|
|
@ -440,7 +440,7 @@ struct import_Locals {
|
||||||
void import(const ToonzScene &scene, std::vector<Resource> &resources,
|
void import(const ToonzScene &scene, std::vector<Resource> &resources,
|
||||||
IoCmd::LoadResourceArguments::ScopedBlock &sb)
|
IoCmd::LoadResourceArguments::ScopedBlock &sb)
|
||||||
{
|
{
|
||||||
import_Locals locals = {scene};
|
import_Locals locals = {scene, std::auto_ptr<OverwriteDialog>()};
|
||||||
|
|
||||||
// Setup import GUI
|
// Setup import GUI
|
||||||
int r, rCount = resources.size();
|
int r, rCount = resources.size();
|
||||||
|
|
Loading…
Reference in a new issue