Log In
bw
/
opentoonz
Clone
Source Code
GIT
Source
Issues
0
Pull Requests
0
Stats
Overview
Files
Commits
Branches
Forks
Releases
918bc7
Merge opentoonz master with conflicts resolved.
Merged and Committed by manongjohn
6 years ago
raw
patch
tree
parents
b41f36e4fa1a9eaee9fc2fc6a92e023ef4caa312
27ab9abe6930fb92d705eb72a21ea1d7cd862c4a
63 files changed.
606 lines added
.
375 lines removed
.
stuff/config/current.txt
file modified
+4
-0
stuff/profiles/layouts/fxs/STD_linearGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_multiLinearGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_multiRadialGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_radialGradientFx.xml
file modified
+1
-0
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+6
-6
toonz/sources/include/tcg/boost/zipped_range.h
file removed
-45
toonz/sources/include/tools/stylepicker.h
file modified
+2
-1
toonz/sources/include/toonzqt/functionsheet.h
file modified
+2
-0
toonz/sources/stdfx/gradients.cpp
file modified
+58
-17
toonz/sources/stdfx/gradients.h
file modified
+6
-2
toonz/sources/stdfx/iwa_bokehreffx.cpp
file modified
+4
-2
toonz/sources/stdfx/stdfx.cpp
file modified
+50
-13
toonz/sources/tnztools/stylepicker.cpp
file modified
+69
-4
toonz/sources/tnztools/toolutils.cpp
file modified
+3
-3
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+16
-9
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+1
-1
toonz/sources/toonz/colormodelviewer.cpp
file modified
+11
-11
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+15
-3
toonz/sources/toonz/imageviewer.cpp
file modified
+35
-18
toonz/sources/toonz/ruler.cpp
file modified
+44
-35
toonz/sources/toonz/xshcellmover.cpp
file modified
+2
-2
toonz/sources/toonz/xshcellviewer.cpp
file modified
+13
-8
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+2
-2
toonz/sources/toonz/xsheetcmd.cpp
file modified
+82
-49
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+2
-2
toonz/sources/toonz/xsheetviewer.cpp
file modified
+7
-7
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+3
-3
toonz/sources/toonzlib/boardsettings.cpp
file modified
+1
-1
toonz/sources/toonzlib/cleanuppalette.cpp
file modified
+2
-2
toonz/sources/toonzlib/fxcommand.cpp
file modified
+2
-2
toonz/sources/toonzlib/ikjacobian.cpp
file modified
+4
-4
toonz/sources/toonzlib/levelupdater.cpp
file modified
+1
-1
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2
-2
toonz/sources/toonzlib/palettecmd.cpp
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/CallCircle.cpp
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/STPic.h
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+1
-1
toonz/sources/toonzlib/stage.cpp
file modified
+4
-4
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+1
-1
toonz/sources/toonzlib/tbinarizer.cpp
file modified
+8
-8
toonz/sources/toonzlib/tcenterlineadjustments.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+6
-9
toonz/sources/toonzlib/tcenterlinepolygonizer.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcenterlineskeletonizer.cpp
file modified
+3
-3
toonz/sources/toonzlib/tcenterlinetostrokes.cpp
file modified
+2
-2
toonz/sources/toonzlib/tcenterlinevectP.h
file modified
+4
-4
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+2
-2
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+2
-2
toonz/sources/toonzlib/tdistort.cpp
file modified
+3
-5
toonz/sources/toonzlib/tproject.cpp
file modified
+15
-15
toonz/sources/toonzlib/tstageobject.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshcolumn.cpp
file modified
+1
-1
toonz/sources/toonzlib/txsheet.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshlevelcolumn.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+2
-2
toonz/sources/toonzqt/combohistogram.cpp
file modified
+10
-10
toonz/sources/toonzqt/dvtextedit.cpp
file modified
+3
-3
toonz/sources/toonzqt/expressionfield.cpp
file modified
+1
-1
toonz/sources/toonzqt/functionpanel.cpp
file modified
+4
-4
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+2
-2
toonz/sources/toonzqt/functionsheet.cpp
file modified
+65
-27
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+6
-6
Merge opentoonz master with conflicts resolved.
stuff/config/current.txt
file modified
+4
-0
stuff/profiles/layouts/fxs/STD_linearGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_multiLinearGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_multiRadialGradientFx.xml
file modified
+1
-0
stuff/profiles/layouts/fxs/STD_radialGradientFx.xml
file modified
+1
-0
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+6
-6
toonz/sources/include/tcg/boost/zipped_range.h
file removed
-45
toonz/sources/include/tools/stylepicker.h
file modified
+2
-1
toonz/sources/include/toonzqt/functionsheet.h
file modified
+2
-0
toonz/sources/stdfx/gradients.cpp
file modified
+58
-17
toonz/sources/stdfx/gradients.h
file modified
+6
-2
toonz/sources/stdfx/iwa_bokehreffx.cpp
file modified
+4
-2
toonz/sources/stdfx/stdfx.cpp
file modified
+50
-13
toonz/sources/tnztools/stylepicker.cpp
file modified
+69
-4
toonz/sources/tnztools/toolutils.cpp
file modified
+3
-3
toonz/sources/tnztools/toonzrasterbrushtool.cpp
file modified
+16
-9
toonz/sources/tnztools/toonzrasterbrushtool.h
file modified
+1
-1
toonz/sources/toonz/colormodelviewer.cpp
file modified
+11
-11
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+15
-3
toonz/sources/toonz/imageviewer.cpp
file modified
+35
-18
toonz/sources/toonz/ruler.cpp
file modified
+44
-35
toonz/sources/toonz/xshcellmover.cpp
file modified
+2
-2
toonz/sources/toonz/xshcellviewer.cpp
file modified
+13
-8
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+2
-2
toonz/sources/toonz/xsheetcmd.cpp
file modified
+82
-49
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+2
-2
toonz/sources/toonz/xsheetviewer.cpp
file modified
+7
-7
toonz/sources/toonzlib/Naa2TlvConverter.cpp
file modified
+3
-3
toonz/sources/toonzlib/boardsettings.cpp
file modified
+1
-1
toonz/sources/toonzlib/cleanuppalette.cpp
file modified
+2
-2
toonz/sources/toonzlib/fxcommand.cpp
file modified
+2
-2
toonz/sources/toonzlib/ikjacobian.cpp
file modified
+4
-4
toonz/sources/toonzlib/levelupdater.cpp
file modified
+1
-1
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2
-2
toonz/sources/toonzlib/palettecmd.cpp
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/CallCircle.cpp
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/STPic.h
file modified
+1
-1
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+1
-1
toonz/sources/toonzlib/stage.cpp
file modified
+4
-4
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+1
-1
toonz/sources/toonzlib/tbinarizer.cpp
file modified
+8
-8
toonz/sources/toonzlib/tcenterlineadjustments.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+6
-9
toonz/sources/toonzlib/tcenterlinepolygonizer.cpp
file modified
+1
-1
toonz/sources/toonzlib/tcenterlineskeletonizer.cpp
file modified
+3
-3
toonz/sources/toonzlib/tcenterlinetostrokes.cpp
file modified
+2
-2
toonz/sources/toonzlib/tcenterlinevectP.h
file modified
+4
-4
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+2
-2
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+2
-2
toonz/sources/toonzlib/tdistort.cpp
file modified
+3
-5
toonz/sources/toonzlib/tproject.cpp
file modified
+15
-15
toonz/sources/toonzlib/tstageobject.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshcolumn.cpp
file modified
+1
-1
toonz/sources/toonzlib/txsheet.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshlevelcolumn.cpp
file modified
+1
-1
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+2
-2
toonz/sources/toonzqt/combohistogram.cpp
file modified
+10
-10
toonz/sources/toonzqt/dvtextedit.cpp
file modified
+3
-3
toonz/sources/toonzqt/expressionfield.cpp
file modified
+1
-1
toonz/sources/toonzqt/functionpanel.cpp
file modified
+4
-4
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+2
-2
toonz/sources/toonzqt/functionsheet.cpp
file modified
+65
-27
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+6
-6