71163f Merge OT master changes with conflicts resolved

Merged and Committed by manongjohn 5 years ago
66 files changed. 2446 lines added. 8190 lines removed.
LICENSE.txt
file modified
+22 -1
README.md
file modified
+2 -0
doc/README_ja.md
file modified
+1 -1
doc/Thumbs.db
file added
+0
doc/how_to_test_prs.md
file added
+47
doc/testing_pr_1.JPG
file added
+0
doc/testing_pr_2.JPG
file added
+0
doc/testing_pr_3.JPG
file added
+0
doc/testing_pr_4.JPG
file added
+0
doc/testing_pr_5.JPG
file added
+0
stuff/config/qss/Blue/Blue.qss
file modified
+1 -1859
stuff/config/qss/Dark/Dark.qss
file modified
+1 -1859
stuff/config/qss/Default/Default.qss
file modified
+1 -1859
stuff/config/qss/Default/less/Default.less
file modified
+50 -11
stuff/config/qss/Default/less/layouts/schematic.less
file modified
+43 -0
stuff/config/qss/Default/less/themes/Light.less
file modified
+15 -0
stuff/config/qss/Light/Light.qss
file modified
+1 -1860
stuff/doc/LICENSE/LICENSE.txt
file added
+31
stuff/doc/LICENSE/LICENSE_boost.txt
file added
+23
stuff/doc/LICENSE/LICENSE_glew.txt
file added
+73
stuff/doc/LICENSE/LICENSE_gotoblas.txtstuff/config/contrib/GotoBLAS_License.txt
file renamed
+1 -3
stuff/doc/LICENSE/LICENSE_kissfft.txt
file added
+12
stuff/doc/LICENSE/LICENSE_libjpeg.txt
file added
+3
stuff/doc/LICENSE/LICENSE_libtiff.txt
file added
+22
stuff/doc/LICENSE/LICENSE_lz4.txt
file added
+24
stuff/doc/LICENSE/LICENSE_openblas.txtstuff/config/contrib/OpenBLAS_license.txt
file renamed
+1 -3
stuff/doc/LICENSE/LICENSE_qt.txt
file added
+169
stuff/doc/LICENSE/LICENSE_superlu.txtstuff/config/contrib/SuperLU_license.txt
file renamed
+5 -7
stuff/profiles/layouts/shortcuts/defopentoonz.ini
file modified
+68 -35
toonz/sources/common/tapptools/tenv.cpp
file modified
+67 -10
toonz/sources/include/tcli.h
file modified
+2 -2
toonz/sources/include/tenv.h
file modified
+6 -0
toonz/sources/include/tfxparam.h
file modified
+8 -1
toonz/sources/include/toonzqt/fxschematicnode.h
file modified
+6 -28
toonz/sources/include/toonzqt/fxschematicscene.h
file modified
+9 -3
toonz/sources/include/toonzqt/fxtypes.h
file added
+27
toonz/sources/include/toonzqt/imageutils.h
file modified
+10 -0
toonz/sources/include/toonzqt/schematicnode.h
file modified
+18 -7
toonz/sources/include/toonzqt/schematicviewer.h
file modified
+293 -0
toonz/sources/include/toonzqt/stageschematicscene.h
file modified
+4 -1
toonz/sources/include/tparamcontainer.h
file modified
+25 -12
toonz/sources/tnztools/brushtool.cpp
file modified
+19 -3
toonz/sources/toonz/convertpopup.cpp
file modified
+40 -13
toonz/sources/toonz/filebrowser.cpp
file modified
+11 -2
toonz/sources/toonz/main.cpp
file modified
+74 -15
toonz/sources/toonz/mainwindow.cpp
file modified
+12 -9
toonz/sources/toonz/sceneviewer.cpp
file modified
+65 -1
toonz/sources/toonz/sceneviewer.h
file modified
+8 -2
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+4 -1
toonz/sources/toonzlib/strokegenerator.cpp
file modified
+38 -27
toonz/sources/toonzlib/toonzfolders.cpp
file modified
+13 -6
toonz/sources/toonzqt/CMakeLists.txt
file modified
+1 -0
toonz/sources/toonzqt/Resources/iconifynodes_off.svg
file added
+23
toonz/sources/toonzqt/Resources/iconifynodes_on.svg
file added
+85
toonz/sources/toonzqt/Resources/iconifynodes_over.svg
file added
+86
toonz/sources/toonzqt/Resources/schematic_link.svg
file modified
+61 -24
toonz/sources/toonzqt/Resources/schematic_link_small.svg
file added
+75
toonz/sources/toonzqt/fxschematicnode.cpp
file modified
+355 -302
toonz/sources/toonzqt/fxschematicscene.cpp
file modified
+28 -16
toonz/sources/toonzqt/imageutils.cpp
file modified
+58 -0
toonz/sources/toonzqt/pluginhost.cpp
file modified
+1 -1
toonz/sources/toonzqt/schematicnode.cpp
file modified
+92 -21
toonz/sources/toonzqt/schematicviewer.cpp
file modified
+81 -3
toonz/sources/toonzqt/stageschematicnode.cpp
file modified
+106 -173
toonz/sources/toonzqt/stageschematicscene.cpp
file modified
+14 -8
toonz/sources/toonzqt/toonzqt.qrc
file modified
+5 -1
    Merge OT master changes with conflicts resolved
    
        
file modified
+22 -1
file modified
+2 -0
file modified
+1 -1
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file added
+0
empty file added
file modified
+1 -1859
file modified
+1 -1859
file modified
+1 -1860
stuff/doc/LICENSE/LICENSE_gotoblas.txt stuff/config/contrib/GotoBLAS_License.txt
file renamed
+1 -3
stuff/doc/LICENSE/LICENSE_openblas.txt stuff/config/contrib/OpenBLAS_license.txt
file renamed
+1 -3
stuff/doc/LICENSE/LICENSE_superlu.txt stuff/config/contrib/SuperLU_license.txt
file renamed
+5 -7
file modified
+2 -2
file modified
+6 -0
file modified
+74 -15