825aea Merged in opentoonz master to resolve conflicts

Merged and Committed by manongjohn 6 years ago
133 files changed. 3891 lines added. 1345 lines removed.
ci-scripts/osx/travis-build.sh
file modified
+3 -1
stuff/config/qss/Blue/Blue.qss
file modified
+1 -1
stuff/config/qss/Dark/Dark.qss
file modified
+1 -1
stuff/config/qss/Default/Default.qss
file modified
+1 -1
stuff/config/qss/Default/less/layouts/misc.less
file modified
+1 -1
stuff/config/qss/Default/less/layouts/popups.less
file modified
+1 -1
stuff/config/qss/Light/Light.qss
file modified
+1 -1
toonz/sources/CMakeLists.txt
file modified
+1 -1
toonz/sources/common/expressions/ttokenizer.cpp
file modified
+2 -3
toonz/sources/common/tfx/tmacrofx.cpp
file modified
+3 -1
toonz/sources/common/tfx/tpassivecachemanager.cpp
file modified
+0 -15
toonz/sources/common/tiio/tiio_jpg_exif.cpp
file modified
+5 -5
toonz/sources/common/tparam/tspectrumparam.cpp
file modified
+4 -4
toonz/sources/common/tvrender/tglregions.cpp
file modified
+11 -10
toonz/sources/common/tvrender/tpalette.cpp
file modified
+2 -1
toonz/sources/common/twain/ttwain_stateX.c
file modified
+2 -0
toonz/sources/include/tcommon.h
file modified
+0 -2
toonz/sources/include/tfxattributes.h
file modified
+1 -0
toonz/sources/include/tools/tooloptions.h
file modified
+57 -0
toonz/sources/include/toonz/doubleparamcmd.h
file modified
+3 -1
toonz/sources/include/toonz/fill.h
file modified
+3 -0
toonz/sources/include/toonz/tapplication.h
file modified
+2 -1
toonz/sources/include/toonz/tpalettehandle.h
file modified
+1 -1
toonz/sources/include/toonz/ttileset.h
file modified
+1 -0
toonz/sources/include/toonzqt/dvdialog.h
file modified
+0 -2
toonz/sources/include/toonzqt/functionsegmentviewer.h
file modified
+4 -3
toonz/sources/include/toonzqt/functionsheet.h
file modified
+5 -0
toonz/sources/include/toonzqt/functiontreeviewer.h
file modified
+25 -0
toonz/sources/include/toonzqt/functionviewer.h
file modified
+2 -0
toonz/sources/include/toonzqt/fxschematicnode.h
file modified
+7 -0
toonz/sources/include/toonzqt/fxsettings.h
file modified
+2 -0
toonz/sources/include/toonzqt/imageutils.h
file modified
+15 -5
toonz/sources/include/toonzqt/menubarcommand.h
file modified
+2 -1
toonz/sources/include/toonzqt/paletteviewer.h
file modified
+2 -0
toonz/sources/include/toonzqt/paletteviewergui.h
file modified
+1 -0
toonz/sources/include/toonzqt/planeviewer.h
file modified
+33 -2
toonz/sources/include/toonzqt/schematicviewer.h
file modified
+5 -2
toonz/sources/include/toonzqt/swatchviewer.h
file modified
+32 -0
toonz/sources/include/toonzqt/viewcommandids.h
file modified
+13 -0
toonz/sources/include/tpalette.h
file modified
+12 -7
toonz/sources/include/tspectrumparam.h
file modified
+3 -3
toonz/sources/stdfx/cloudsfx.cpp
file modified
+10 -10
toonz/sources/stdfx/diamondgradientfx.cpp
file modified
+8 -7
toonz/sources/stdfx/igs_line_blur.cpp
file modified
+36 -40
toonz/sources/stdfx/igs_line_blur.h
file modified
+4 -5
toonz/sources/stdfx/ino_line_blur.cpp
file modified
+116 -198
toonz/sources/stdfx/iwa_particlesfx.cpp
file modified
+12 -9
toonz/sources/stdfx/linearwavefx.cpp
file modified
+5 -5
toonz/sources/stdfx/multitonefx.cpp
file modified
+5 -4
toonz/sources/stdfx/particlesfx.cpp
file modified
+12 -9
toonz/sources/stdfx/randomwavefx.cpp
file modified
+4 -4
toonz/sources/stdfx/ripplefx.cpp
file modified
+5 -5
toonz/sources/stdfx/squaregradientfx.cpp
file modified
+2 -2
toonz/sources/stdfx/stdfx.cpp
file modified
+32 -31
toonz/sources/stdfx/test_boxfx.cpp
file modified
+5 -4
toonz/sources/tconverter/tconverter.cpp
file modified
+8 -0
toonz/sources/tnztools/CMakeLists.txt
file modified
+2 -0
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+3 -0
toonz/sources/tnztools/fullcolorfilltool.cpp
file added
+223
toonz/sources/tnztools/fullcolorfilltool.h
file added
+45
toonz/sources/tnztools/paintbrushtool.cpp
file modified
+2 -9
toonz/sources/tnztools/stylepickertool.cpp
file modified
+11 -4
toonz/sources/tnztools/stylepickertool.h
file modified
+1 -1
toonz/sources/tnztools/tooloptions.cpp
file modified
+134 -23
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+12 -4
toonz/sources/tnztools/tooloptionscontrols.h
file modified
+4 -2
toonz/sources/toonz/colormodelviewer.cpp
file modified
+1 -1
toonz/sources/toonz/columnselection.cpp
file modified
+2 -1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+6 -3
toonz/sources/toonz/commandbarpopup.cpp
file modified
+1 -1
toonz/sources/toonz/filmstripcommand.cpp
file modified
+28 -29
toonz/sources/toonz/floatingpanelcommand.cpp
file modified
+1 -0
toonz/sources/toonz/fxparameditorpopup.cpp
file modified
+2 -1
toonz/sources/toonz/imageviewer.cpp
file modified
+353 -82
toonz/sources/toonz/imageviewer.h
file modified
+23 -1
toonz/sources/toonz/iocommand.cpp
file modified
+117 -53
toonz/sources/toonz/iocommand.h
file modified
+7 -6
toonz/sources/toonz/mainwindow.cpp
file modified
+106 -27
toonz/sources/toonz/mainwindow.h
file modified
+7 -1
toonz/sources/toonz/pane.cpp
file modified
+50 -6
toonz/sources/toonz/pane.h
file modified
+3 -1
toonz/sources/toonz/penciltestpopup.cpp
file modified
+41 -17
toonz/sources/toonz/penciltestpopup.h
file modified
+5 -2
toonz/sources/toonz/preferencespopup.cpp
file modified
+5 -5
toonz/sources/toonz/projectpopup.cpp
file modified
+11 -10
toonz/sources/toonz/reframepopup.cpp
file modified
+7 -3
toonz/sources/toonz/reframepopup.h
file modified
+3 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+173 -28
toonz/sources/toonz/sceneviewer.h
file modified
+12 -6
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+37 -6
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+91 -75
toonz/sources/toonz/startuppopup.cpp
file modified
+40 -9
toonz/sources/toonz/tapp.cpp
file modified
+3 -2
toonz/sources/toonz/tapp.h
file modified
+1 -1
toonz/sources/toonz/tasksviewer.cpp
file modified
+1 -1
toonz/sources/toonz/tpanels.cpp
file modified
+50 -0
toonz/sources/toonz/tpanels.h
file modified
+15 -0
toonz/sources/toonz/viewerpane.cpp
file modified
+5 -2
toonz/sources/toonz/xshcellmover.cpp
file modified
+1 -4
toonz/sources/toonz/xshcellviewer.cpp
file modified
+165 -167
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+72 -14
toonz/sources/toonz/xsheetdragtool.h
file modified
+1 -0
toonz/sources/toonz/xsheetviewer.cpp
file modified
+7 -3
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+5 -5
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+5 -5
toonz/sources/toonzlib/cellpositionratio.cpp
file modified
+4 -2
toonz/sources/toonzlib/doubleparamcmd.cpp
file modified
+16 -3
toonz/sources/toonzlib/fill.cpp
file modified
+217 -3
toonz/sources/toonzlib/stylemanager.cpp
file modified
+48 -10
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+10 -6
toonz/sources/toonzlib/tpalettehandle.cpp
file modified
+14 -1
toonz/sources/toonzlib/tproject.cpp
file modified
+2 -3
toonz/sources/toonzlib/ttileset.cpp
file modified
+10 -0
toonz/sources/toonzlib/txsheet.cpp
file modified
+7 -6
toonz/sources/toonzlib/txsheetexpr.cpp
file modified
+5 -7
toonz/sources/toonzlib/txshsoundtextcolumn.cpp
file modified
+1 -1
toonz/sources/toonzqt/CMakeLists.txt
file modified
+1 -1
toonz/sources/toonzqt/dvdialog.cpp
file modified
+48 -56
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+30 -31
toonz/sources/toonzqt/functionsheet.cpp
file modified
+103 -12
toonz/sources/toonzqt/functiontreeviewer.cpp
file modified
+0 -25
toonz/sources/toonzqt/functionviewer.cpp
file modified
+4 -1
toonz/sources/toonzqt/fxschematicnode.cpp
file modified
+88 -9
toonz/sources/toonzqt/fxschematicscene.cpp
file modified
+10 -1
toonz/sources/toonzqt/fxsettings.cpp
file modified
+30 -14
toonz/sources/toonzqt/imageutils.cpp
file modified
+29 -12
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+79 -55
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+4 -1
toonz/sources/toonzqt/planeviewer.cpp
file modified
+331 -10
toonz/sources/toonzqt/plugin_param_traits.h
file modified
+1 -1
toonz/sources/toonzqt/schematicviewer.cpp
file modified
+37 -26
toonz/sources/toonzqt/styleeditor.cpp
file modified
+2 -1
toonz/sources/toonzqt/swatchviewer.cpp
file modified
+326 -16
    Merged in opentoonz master to resolve conflicts
    
        
file modified
+1 -1
file modified
+32 -31
file modified
+50 -6
file modified
+3 -1
file modified
+3 -2
file modified
+1 -1
file modified
+15 -0
file modified
+217 -3