Merged branch 'master' from opentoonz (w/o Github actions)

Author: manongjohn

ci-scripts/osx/travis-install.sh

@@ -6,13 +6,3 @@ brew install clang-format
 # from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
 # so we start to use the latest version of Qt. (#1910)
 brew install qt
-# delete older qt versions and make sure to have only the latest
-brew cleanup qt
-# temp workaround to brew installed glew cmake info overriding glew lib detection
-# which causes compiling issues later
-if [ -L /usr/local/lib/cmake/glew ]
-then
-   echo "Symbolic link '/usr/local/lib/cmake/glew' detected. Removing to avoid glew lib detection issue!"
-   ls -l /usr/local/lib/cmake/glew
-   rm /usr/local/lib/cmake/glew
-fi

doc/README_ja.md

@@ -4,6 +4,7 @@
 
 [![](https://ci.appveyor.com/api/projects/status/oa5l5pc964h8fv49/branch/master?svg=true)](https://ci.appveyor.com/project/opentoonz/opentoonz)
 [![](https://travis-ci.org/opentoonz/opentoonz.svg?branch=master)](https://travis-ci.org/opentoonz/opentoonz)
+[![](https://github.com/opentoonz/opentoonz/workflows/Build/badge.svg?branch=master)](https://github.com/opentoonz/opentoonz/actions)
 
 ## これは何？
 

doc/how_to_build_macosx.md

@@ -13,11 +13,6 @@
 - Jpeg-turbo
 
 ## Building on macOS
-### Download boost from https://boost.org
-
-Download the .bz2 mac (unix if mac not specified) version 1_55_0 or later (last tested with 1_72_0)
-
-Save for later step.
 
 ### Download and install Xcode from Apple
 
@@ -42,7 +37,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
 
 In a Terminal window, execute the following statements:
 ```
-$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint qt opencv jpeg-turbo
+$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint qt boost opencv jpeg-turbo
 $ git lfs install
 ```
 
@@ -65,21 +60,18 @@ $ cd ~/Documents   #or where you want to store the repository#
 $ git clone https://github.com/opentoonz/opentoonz
 $ cd opentoonz
 $ git lfs pull
-$ cd thirdparty/boost
-$ mv ~/Downloads/boost_1_72_0.tar.bz2 .   #or whatever the boost filename you downloaded is#
-$ tar xvjf boost_1_72_0.tar.bz2
-$ cd ../lzo
+$ cd thirdparty/lzo
 $ cp -r 2.03/include/lzo driver
 $ cd ../tiff-4.0.3
 $ ./configure --disable-lzma && make
 ```
 
-### Configure build for QT version
-
-Edit the `/Users/yourlogin/Documents/opentoonz/toonz/sources/CMakeLists.txt` file at line 160 (64-bit OS) or 172 (32-bit OS) and modify the root path for the QT lib directory
-
-If you installed QT using `brew`, you can get the version and path to use with: `$ brew info qt`.  The lib path will look something like this: `/usr/local/Cellar/qt/5.12.2/lib`
-If you downloaded the QT installer and installed to `/Users/yourlogin/Qt`, your lib path may look something like this: `~/Qt/5.12.2/clang_64/lib` or `~/Qt/5.12.2/clang_32/lib`
+If you downloaded and installed boost from https://boost.org instead of homebrew, move the package under `thirdparty/boost` as follows: 
+```
+$ cd thirdparty/boost
+$ mv ~/Downloads/boost_1_72_0.tar.bz2 .   #or whatever the boost filename you downloaded is#
+$ tar xvjf boost_1_72_0.tar.bz2
+```
 
 ### Configure environment and Build OpenToonz
 
@@ -95,16 +87,17 @@ $ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconf
 
 To build from command line, do the following:
 ```
-$ CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.2 cmake ../sources   #replace QT path with your installed QT version#
+$ cmake ../sources -DQT_PATH='/usr/local/opt/qt/lib'  #replace QT path with your installed QT version#
 $ make
 ```
+- If you downloaded the QT installer and installed to `/Users/yourlogin/Qt` instead of by using homebrew, your lib path may look something like this: `~/Qt/5.12.2/clang_64/lib` or `~/Qt/5.12.2/clang_32/lib`
 
 To build using Xcode, do the following:
 ```
 $ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
-$ CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.2 cmake -G Xcode ../sources -B.   #replace QT path with your installed QT version#
+$ cmake -G Xcode ../sources -B. -DQT_PATH='/usr/local/opt/qt/lib' -DWITH_TRANSLATION=OFF   #replace QT path with your installed QT version#
 ```
-
+- Note that the option `-DWITH_TRANSLATION=OFF` is needed to avoid error when using XCode 12+ which does not allow to add the same source to multiple targets.
 - Open Xcode app and open project /Users/yourlogin/Documents/opentoonz/toonz/build/OpenToonz.xcodeproj
 - Change `ALL_BUILD` to `OpenToonz`
 - Start build with: Product -> Build

doc/how_to_build_macosx_ja.md

@@ -5,67 +5,88 @@
 - git
 - brew
 - Xcode
-- cmake
-  - バージョン 3.2.2 で動作確認済みです。
-- Qt
-  - http://download.qt.io/official_releases/qt/5.9/5.9.2/
-    - qt-opensource-mac-x64-5.9.2.dmg
-- boost
-  - http://www.boost.org/users/history/version_1_55_0.html
+- cmake (3.2.2以降)
+- Qt (5.9.2以降)
+- boost　(1.55.0以降)
 
 ## ビルド手順
 
-### brew で必要なパッケージをインストール
-
-```
-$ brew install glew lz4 libjpeg libpng lzo pkg-config
-```
+### Xcode をインストール
 
-### リポジトリを clone
+### Homebrew をインストール
 
+1. ターミナルウィンドウを起動
+2. 下記を実行します：
 ```
-$ git clone https://github.com/opentoonz/opentoonz
+$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 ```
 
-### stuff ディレクトリの設置 (任意)
-
-`/Applications/OpenToonz/OpenToonz_stuff` というディレクトリが存在していない場合は以下のコマンド等でリポジトリのひな形を設置する必要があります。
+### brew で必要なパッケージをインストール
 
 ```
-$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_stuff
+$ brew install glew lz4 libjpeg libpng lzo pkg-config libusb cmake git-lfs libmypaint qt boost
+$ git lfs install
 ```
 
-### thirdparty 下の tiff をビルド
+### リポジトリを clone
 
 ```
-$ cd opentoonz/thirdparty/tiff-4.0.3
+$ git clone https://github.com/opentoonz/opentoonz
+$ cd opentoonz
+$ git lfs pull
+$ cd thirdparty/lzo
+$ cp -r 2.03/include/lzo driver
+$ cd ../tiff-4.0.3
 $ ./configure && make
 ```
 
-### thirdpaty 下に boost を設置
-
-以下のコマンドは `~/Downsloads` に `boost_1_55_0.tar.bz2` がダウンロードされていることを想定しています。
-
+boost をhomebrewではなく https://boost.org からダウンロードした場合は以下を実行します。以下のコマンドは `~/Downsloads` に `boost_1_72_0.tar.bz2` がダウンロードされていることを想定しています。
 ```
 $ cd ../boost
-$ mv ~/Downloads/boost_1_55_0.tar.bz2 .
-$ tar xjvf boost_1_55_0.tar.bz2
+$ mv ~/Downloads/boost_1_72_0.tar.bz2 .
+$ tar xjvf boost_1_72_0.tar.bz2
 ```
 
 ### 本体のビルド
 
+1. buildディレクトリの作成
 ```
 $ cd ../../toonz
 $ mkdir build
 $ cd build
-$ cmake ../sources
+```
+
+2. ビルド
+コマンドラインの場合は下記を実行します。
+```
+$ cmake ../sources -DQT_PATH='/usr/local/opt/qt/lib'
 $ make
 ```
+- Qt をHomebrewでなく http://download.qt.io/official_releases/qt/ からダウンロードして `/Users/ユーザ名/Qt` にインストールしている場合、`QT_PATH`の値は `~/Qt/5.12.2/clang_64/lib` または `~/Qt/5.12.2/clang_32/lib` のようになります。
 
 ビルドが長いので気長に待ちます。
 
-### 完成
+Xcodeを用いる場合は下記を実行します。
+```
+$ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+$ cmake -G Xcode ../sources -B. -DQT_PATH='/usr/local/opt/qt/lib' -DWITH_TRANSLATION=OFF
+```
+- オプション `-DWITH_TRANSLATION=OFF` はXcode12以降で必要です。
+- Xcodeでプロジェクト `/opentoonz/toonz/build/OpenToonz.xcodeproj` を開き、ビルドします。
+
+### stuff ディレクトリの設置 (任意)
+
+`/Applications/OpenToonz/OpenToonz_stuff` というディレクトリが存在していない場合は以下のコマンド等でリポジトリのひな形を設置する必要があります。
+
+```
+$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_stuff
+$ sudo chmod -R 777 /Applications/OpenToonz
+```
+
+### アプリケーションの実行
 
 ```
 $ open ./toonz/OpenToonz.app
 ```
+
+- Xcode でビルドしている場合、アプリケーションは　`.toonz/build/Debug/OpenToonz.app` にあります。

stuff/config/current.txt

@@ -1310,9 +1310,16 @@
 
   <item>"STD_iwa_GlareFx" 			"Glare Iwa" 	</item>
   <item>"STD_iwa_GlareFx.renderMode"	"Render Mode"		</item>
+  <item>"STD_iwa_GlareFx.irisMode"	"Iris Shape"		</item>
+  <item>"STD_iwa_GlareFx.irisScale"	"Iris Scale"		</item>
+  <item>"STD_iwa_GlareFx.irisGearEdgeCount"	"Edges"		</item>
+  <item>"STD_iwa_GlareFx.irisRandomSeed"	"Random Seed"		</item>
+  <item>"STD_iwa_GlareFx.irisSymmetry"	"Symmetry"		</item>
+  <item>"STD_iwa_GlareFx.irisAppearance"	"Appearance"		</item>
   <item>"STD_iwa_GlareFx.intensity"	"Intensity"		</item>
   <item>"STD_iwa_GlareFx.size"	"Filter Size"		</item>
   <item>"STD_iwa_GlareFx.rotation"	"Filter Rotation"		</item>
+  <item>"STD_iwa_GlareFx.aberration"	"Chromatic Aberration"		</item>
   <item>"STD_iwa_GlareFx.noise_factor"	"Noise Factor"		</item>
   <item>"STD_iwa_GlareFx.noise_size"	"Noise Size"		</item>
   <item>"STD_iwa_GlareFx.noise_octave"	"Noise Octave"		</item>

stuff/doc/LICENSE/LICENSE_tahoma.txt renamed to stuff/doc/LICENSE/LICENSE_tahoma2d.txt

@@ -1,9 +1,9 @@
-License Agreement For Tahoma
-[https://github.com/turtletooth/tahoma]
+License Agreement For Tahoma2D
+[https://github.com/tahoma2d/tahoma2d/]
 
 - - - - - - - - - - - - - - - -
 
-Tahoma
+Tahoma2D
 
 All contributions by Jeremy Bullock:
 Copyright (c) 2016 - 2020, Jeremy Bullock

stuff/profiles/layouts/fxs/STD_iwa_GlareFx.xml

@@ -1,9 +1,24 @@
 <fxlayout help_command="iexplore" help_file="BokehIwa.html">
 	<page name="Glare Iwa">
 		<control>renderMode</control>
+		<control>irisMode</control>
+		<vbox modeSensitive="irisMode" mode="1,2,3,4">
+			<separator/>
+			<control>irisScale</control>
+			<control>irisSymmetry</control>
+			<control>irisAppearance</control>
+		</vbox>
+		<vbox modeSensitive="irisMode" mode="4">
+			<control>irisGearEdgeCount</control>
+			<control>irisRandomSeed</control>
+		</vbox>
+		<vbox modeSensitive="irisMode" mode="1,2,3,4">
+			<separator/>
+		</vbox>
 		<control>intensity</control>
 		<control>size</control>
 		<control>rotation</control>
+		<control>aberration</control>
 		<control>noise_factor</control>
 		<control>noise_size</control>
 		<control>noise_octave</control>

stuff/profiles/layouts/fxs/STD_iwa_MotionBlurCompFx.xml

@@ -1,10 +1,10 @@
 <fxlayout help_file="MotionBlurIwa.html">
 	<page name="Motion Blur Iwa">
  	<vbox>
-		<hbox>
 		<control>motionObjectType</control>
+		<vbox modeSensitive="motionObjectType" mode="1,2,4">
 		<control>motionObjectIndex</control>
-		</hbox>
+		</vbox>
 		<control>shutterStart</control>
 		<control>startValue</control>
 		<control>startCurve</control>

stuff/profiles/layouts/rooms/Default/menubar_template.xml

@@ -73,8 +73,8 @@
         <menu title="Arrange">
             <command>MI_BringToFront</command>
             <command>MI_BringForward</command>
-            <command>MI_SendBack</command>
             <command>MI_SendBackward</command>
+            <command>MI_SendBack</command>
         </menu>
     </menu>
     <menu title="Scan &amp;&amp; Cleanup">

toonz/sources/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_BUILD_TYPE_INIT Release)
 
@@ -102,6 +102,7 @@ endif()
 option(WITH_SYSTEM_LZO "Use the system LZO library instead of 'thirdpary'" ${_init_SYSTEM_LZO})
 option(WITH_SYSTEM_SUPERLU "Use the system SuperLU library instead of 'thirdpary'" ${_init_SYSTEM_SUPERLU})
 option(WITH_CANON "Build with Canon DSLR support - Requires Canon SDK" OFF)
+option(WITH_TRANSLATION "Generate translation projects as well" ON)
 
 # avoid using again
 option_defaults_clear()
@@ -198,6 +199,11 @@ elseif(BUILD_ENV_UNIXLIKE)
     endif()
     if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         add_definitions(-DLINUX)
+    elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
+        set(BUILD_TARGET_BSD ON)
+        add_definitions(-D_BSD_SOURCE -DFREEBSD)
+        include_directories("/usr/local/include/")
+        message(STATUS "Configuring for BSD system")
     elseif(NOT BUILD_TARGET_WIN)
         message(WARNING "Support for generic Unix (Not Apple or Linux) isn't yet working!")
     endif()
@@ -394,7 +400,11 @@ elseif(BUILD_ENV_APPLE)
     if(GLEW-NOTFOUND)
         pkg_check_modules(GLEW REQUIRED glew)
     endif()
-    set(GLEW_LIB ${GLEW_LIBRARIES})
+    if (TARGET GLEW::GLEW)
+      set(GLEW_LIB GLEW::GLEW)
+    else()
+      set(GLEW_LIB ${GLEW_LIBRARIES})
+    endif()
 
     pkg_check_modules(LZ4_LIB REQUIRED liblz4)
 
@@ -442,7 +452,9 @@ elseif(BUILD_ENV_UNIXLIKE)
     endif()
     find_library(Z_LIB z)
 
-    find_package(TIFF REQUIRED)
+    if(NOT BUILD_TARGET_BSD)
+        find_package(TIFF REQUIRED)
+    endif()
     find_package(PNG REQUIRED)
     set(PNG_LIB ${PNG_LIBRARY})
     message("******* libpng:" ${PNG_LIB})
@@ -591,26 +603,28 @@ if(BUILD_ENV_MSVC AND MSVC_VERSION EQUAL 1800)
     add_compile_options("/wd4819")
 endif()
 
-# generate Qt translations and messages
-set(LANGUAGES japanese italian french spanish chinese german russian korean czech)
-
-function(add_translation module)
-    set(translation)
-    foreach(lang ${LANGUAGES})
-        set(name "${CMAKE_SOURCE_DIR}/translations/${lang}/${module}.ts")
-        list(APPEND translation ${name})
-        set_source_files_properties(${name} PROPERTIES
-            OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/loc/${lang}"
+if(WITH_TRANSLATION)
+    # generate Qt translations and messages
+    set(LANGUAGES japanese italian french spanish chinese german russian korean czech)
+
+    function(add_translation module)
+        set(translation)
+        foreach(lang ${LANGUAGES})
+            set(name "${CMAKE_SOURCE_DIR}/translations/${lang}/${module}.ts")
+            list(APPEND translation ${name})
+            set_source_files_properties(${name} PROPERTIES
+                OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/loc/${lang}"
+            )
+        endforeach()
+
+        qt5_create_translation(message ${translation} ${ARGN})
+
+        add_custom_target("translation_${module}" DEPENDS ${message})
+        set_target_properties("translation_${module}" PROPERTIES
+            EXCLUDE_FROM_DEFAULT_BUILD TRUE
         )
-    endforeach()
-
-    qt5_create_translation(message ${translation} ${ARGN})
-
-    add_custom_target("translation_${module}" DEPENDS ${message})
-    set_target_properties("translation_${module}" PROPERTIES
-        EXCLUDE_FROM_DEFAULT_BUILD TRUE
-    )
-endfunction()
+    endfunction()
+endif()
 
 set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")