246710 Merge pull request #3630 from shun-iwasawa/tahoma2d_porting_201211

33 files Merged by Rodney 5 years ago , Committed by GitHub 5 years ago ,
33 files changed. 201 lines added. 181 lines removed.
toonz/sources/image/ffmpeg/tiio_gif.h
file modified
+3 -3
toonz/sources/image/ffmpeg/tiio_mp4.h
file modified
+3 -3
toonz/sources/image/ffmpeg/tiio_webm.h
file modified
+3 -3
toonz/sources/image/sprite/tiio_sprite.h
file modified
+3 -3
toonz/sources/include/tools/pinchtool.h
file modified
+14 -14
toonz/sources/include/tools/tooloptions.h
file modified
+1 -1
toonz/sources/include/toonz/preferencesitemids.h
file modified
+7 -7
toonz/sources/include/toonzqt/schematicviewer.h
file modified
+2 -2
toonz/sources/stdfx/ino_line_blur.cpp
file modified
+7 -5
toonz/sources/stdfx/iwa_bokehfx.h
file modified
+7 -5
toonz/sources/stdfx/iwa_bokehreffx.h
file modified
+6 -4
toonz/sources/stdfx/iwa_glarefx.h
file modified
+7 -5
toonz/sources/tnztools/rasterselectiontool.h
file modified
+1 -1
toonz/sources/tnztools/rgbpickertool.cpp
file modified
+16 -25
toonz/sources/tnztools/skeletontool.h
file modified
+18 -18
toonz/sources/tnztools/stylepickertool.h
file modified
+2 -2
toonz/sources/tnztools/vectorselectiontool.h
file modified
+1 -1
toonz/sources/tnztools/viewtools.h
file modified
+1 -1
toonz/sources/toonz/convertpopup.cpp
file modified
+7 -0
toonz/sources/toonz/filebrowserpopup.h
file modified
+2 -2
toonz/sources/toonz/imageviewer.h
file modified
+2 -2
toonz/sources/toonz/layerheaderpanel.h
file modified
+2 -2
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+1 -0
toonz/sources/toonz/penciltestpopup.h
file modified
+4 -4
toonz/sources/toonz/preferencespopup.cpp
file modified
+20 -13
toonz/sources/toonz/sceneviewer.h
file modified
+6 -6
toonz/sources/toonz/subscenecommand.cpp
file modified
+10 -5
toonz/sources/toonzlib/imagebuilders.h
file modified
+2 -2
toonz/sources/toonzlib/preferences.cpp
file modified
+12 -12
toonz/sources/toonzlib/tpalettehandle.cpp
file modified
+2 -2
toonz/sources/toonzqt/colorfield.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+25 -25
toonz/sources/toonzqt/styleselection.cpp
file modified
+3 -2
    Merge pull request #3630 from shun-iwasawa/tahoma2d_porting_201211
    
    Tahoma2D porting (Dec 11, 2020) by artisteacher, jeremybullock and manongjohn