a495be Merge OT master updates and fixed conflicts

Merged and Committed by manongjohn 6 years ago
91 files changed. 1433 lines added. 2889 lines removed.
appveyor.yml
file modified
+1 -1
ci-scripts/linux/travis-install.sh
file modified
+1 -1
ci-scripts/osx/travis-build.sh
file modified
+1 -1
stuff/config/loc/Español/tnztools.qm
file modified
+0 -0
stuff/config/loc/Español/toonz.qm
file modified
+0 -0
stuff/config/loc/Español/toonzqt.qm
file modified
+0 -0
stuff/config/loc/Russian (Русский)/tnztools.qm
file modified
+0 -0
stuff/config/loc/Russian (Русский)/toonz.qm
file modified
+0 -0
stuff/config/loc/Russian (Русский)/toonzqt.qm
file modified
+0 -0
stuff/config/loc/中文/tnztools.qm
file modified
+0 -0
stuff/config/loc/中文/toonz.qm
file modified
+0 -0
stuff/config/loc/中文/toonzlib.qm
file modified
+0 -0
stuff/config/loc/中文/toonzqt.qm
file modified
+0 -0
toonz/sources/common/tfx/trenderer.cpp
file modified
+1 -4
toonz/sources/common/tgeometry/tgeometry.cpp
file modified
+12 -6
toonz/sources/common/timage_io/timage_io.cpp
file modified
+3 -3
toonz/sources/common/trop/tdespeckle.cpp
file modified
+1 -4
toonz/sources/common/trop/tresample.cpp
file modified
+1 -1
toonz/sources/common/trop/tropcm.cpp
file modified
+1 -1
toonz/sources/common/tsound/tsound_qt.cpp
file modified
+173 -188
toonz/sources/common/tstream/tpersistset.cpp
file modified
+2 -3
toonz/sources/include/tcg/algorithm.h
file removed
-180
toonz/sources/include/tcg/auto.h
file removed
-199
toonz/sources/include/tcg/deleter_types.h
file removed
-89
toonz/sources/include/tcg/functional.h
file removed
-61
toonz/sources/include/tcg/hpp/image_iterator.hpp
file removed
-249
toonz/sources/include/tcg/image_iterator.h
file removed
-255
toonz/sources/include/tcg/rect.h
file removed
-276
toonz/sources/include/tcg/size.h
file removed
-218
toonz/sources/include/tcg/tcg_algorithm.h
file removed
-3
toonz/sources/include/tcg/tcg_auto.h
file removed
-3
toonz/sources/include/tcg/tcg_deleter_types.h
file removed
-3
toonz/sources/include/tcg/tcg_image_iterator.h
file removed
-3
toonz/sources/include/tcommon.h
file modified
+0 -6
toonz/sources/include/tools/cursors.h
file modified
+1 -1
toonz/sources/include/tpixel.h
file modified
+3 -3
toonz/sources/include/tversion.h
file modified
+2 -2
toonz/sources/stdfx/iwa_particlesengine.cpp
file modified
+32 -35
toonz/sources/stdfx/iwa_particlesfx.h
file modified
+0 -1
toonz/sources/stdfx/particles.cpp
file modified
+10 -8
toonz/sources/stdfx/particlesengine.cpp
file modified
+13 -13
toonz/sources/stdfx/particlesfx.cpp
file modified
+2 -1
toonz/sources/stdfx/particlesfx.h
file modified
+0 -1
toonz/sources/tnztools/CMakeLists.txt
file modified
+20 -19
toonz/sources/tnztools/plastictool_build.cpp
file modified
+6 -10
toonz/sources/tnztools/stylepickertool.cpp
file modified
+9 -0
toonz/sources/tnztools/tool.cpp
file modified
+37 -0
toonz/sources/tnztools/tooloptions.cpp
file modified
+2 -5
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+4 -0
toonz/sources/tnztools/typetool.cpp
file modified
+1 -1
toonz/sources/tnztools/viewtools.h
file modified
+1 -1
toonz/sources/toonz/CMakeLists.txt
file modified
+63 -61
toonz/sources/toonz/castviewer.cpp
file modified
+1 -1
toonz/sources/toonz/cellselection.cpp
file modified
+1 -1
toonz/sources/toonz/colormodelviewer.cpp
file modified
+2 -2
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+1 -1
toonz/sources/toonz/exportpanel.cpp
file modified
+2 -2
toonz/sources/toonz/filebrowser.cpp
file modified
+1 -1
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+2 -4
toonz/sources/toonz/flipbook.cpp
file modified
+2 -2
toonz/sources/toonz/kis_tablet_support_win8.cpp
file modified
+1 -1
toonz/sources/toonz/loadfoldercommand.cpp
file modified
+0 -1
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+9 -4
toonz/sources/toonz/styleshortcutswitchablepanel.cpp
file modified
+1 -1
toonz/sources/toonz/xshcellviewer.cpp
file modified
+0 -1
toonz/sources/toonzlib/CMakeLists.txt
file modified
+73 -72
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+3 -3
toonz/sources/toonzlib/imagepainter.cpp
file modified
+4 -1
toonz/sources/toonzlib/movierenderer.cpp
file modified
+17 -9
toonz/sources/toonzlib/scriptbinding_centerline_vectorizer.cpp
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_level.cpp
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_outline_vectorizer.cpp
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_renderer.cpp
file modified
+1 -1
toonz/sources/toonzqt/CMakeLists.txt
file modified
+38 -38
toonz/sources/toonzqt/dvdialog.cpp
file modified
+2 -3
toonz/sources/toonzqt/dvtextedit.cpp
file modified
+1 -1
toonz/sources/toonzqt/freelayout.cpp
file modified
+2 -3
toonz/sources/toonzqt/gutil.cpp
file modified
+2 -2
toonz/sources/toonzqt/lutcalibrator.cpp
file modified
+6 -4
toonz/sources/toonzqt/paramfield.cpp
file modified
+1 -2
toonz/sources/translations/chinese/tnztools.ts
file modified
+18 -18
toonz/sources/translations/chinese/toonz.ts
file modified
+154 -140
toonz/sources/translations/chinese/toonzlib.ts
file modified
+1 -1
toonz/sources/translations/chinese/toonzqt.ts
file modified
+39 -38
toonz/sources/translations/russian/tnztools.ts
file modified
+73 -70
toonz/sources/translations/russian/toonz.ts
file modified
+336 -319
toonz/sources/translations/russian/toonzqt.ts
file modified
+54 -55
toonz/sources/translations/spanish/tnztools.ts
file modified
+17 -17
toonz/sources/translations/spanish/toonz.ts
file modified
+156 -141
toonz/sources/translations/spanish/toonzqt.ts
file modified
+5 -5
toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml
file modified
+1 -1
    Merge OT master updates and fixed conflicts
    
        
file modified
+1 -1