c382b8 Merge remote-tracking branch 'origin/master' into organize_palette

Merged and Committed by shun_iwasawa 9 years ago
216 files changed. 4219 lines added. 646 lines removed.
.travis.yml
file modified
+3 -0
ci-scripts/linux/travis-install.sh
file modified
+1 -1
doc/how_to_build_linux.md
file modified
+2 -3
doc/how_to_build_win.md
file modified
+58 -27
doc/how_to_build_win_ja.md
file modified
+56 -56
stuff/config/loc/中文/colorfx.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/日本語/toonz.qm
file modified
+0 -0
stuff/config/qss/gray_048/gray_048.less
file modified
+7 -0
stuff/config/qss/gray_048/gray_048.qss
file modified
+11 -0
stuff/config/qss/gray_048/gray_048_mac.qss
file modified
+11 -0
stuff/config/qss/gray_072/gray_072.less
file modified
+7 -0
stuff/config/qss/gray_072/gray_072.qss
file modified
+11 -0
stuff/config/qss/gray_072/gray_072_mac.qss
file modified
+11 -0
stuff/config/qss/gray_128/gray_128.less
file modified
+17 -0
stuff/config/qss/gray_128/gray_128.qss
file modified
+21 -0
stuff/config/qss/gray_128/gray_128_mac.qss
file modified
+21 -0
stuff/profiles/layouts/rooms/StudioGhibli/menubar_template.xml
file modified
+2 -0
stuff/profiles/layouts/rooms/StudioGhibli/room1_menubar.xml
file modified
+2 -0
toonz/cmake/util_compiler.cmake
file added
+33
toonz/sources/CMakeLists.txt
file modified
+51 -8
toonz/sources/colorfx/strokestyles.cpp
file modified
+1 -1
toonz/sources/common/psdlib/psd.cpp
file modified
+1 -1
toonz/sources/common/psdlib/psdutils.cpp
file modified
+1 -3
toonz/sources/common/tapptools/ttimer.cpp
file modified
+2 -2
toonz/sources/common/tcore/tstring.cpp
file modified
+4 -3
toonz/sources/common/tfx/trenderer.cpp
file modified
+3 -1
toonz/sources/common/tgl/tgl.cpp
file modified
+4 -4
toonz/sources/common/tipc/tipc.cpp
file modified
+3 -3
toonz/sources/common/trop/quickput.cpp
file modified
+9 -6
toonz/sources/common/trop/tresample.cpp
file modified
+7 -7
toonz/sources/common/tsystem/cpuextensions.cpp
file modified
+2 -2
toonz/sources/common/tsystem/tsystem.cpp
file modified
+21 -6
toonz/sources/common/tunit/tunit.cpp
file modified
+9 -4
toonz/sources/common/tvectorimage/outlineApproximation.h
file modified
+1 -1
toonz/sources/common/tvectorimage/tstroke.cpp
file modified
+2 -2
toonz/sources/common/tvrender/qtofflinegl.cpp
file modified
+7 -8
toonz/sources/common/tvrender/tofflinegl.cpp
file modified
+2 -2
toonz/sources/image/CMakeLists.txt
file modified
+12 -3
toonz/sources/image/bmp/filebmp.h
file modified
+1 -1
toonz/sources/image/mesh/tiio_mesh.h
file modified
+1 -1
toonz/sources/image/pli/pli_io.cpp
file modified
+3 -3
toonz/sources/image/png/tiio_png.cpp
file modified
+1 -1
toonz/sources/image/quantel/filequantel.c
file modified
+1 -1
toonz/sources/image/sgi/filesgi.cpp
file modified
+1 -1
toonz/sources/image/tga/tiio_tga.cpp
file modified
+1 -1
toonz/sources/image/tif/tiio_tif.cpp
file modified
+3 -3
toonz/sources/image/tiio.cpp
file modified
+3 -3
toonz/sources/image/tzl/tiio_tzl.cpp
file modified
+10 -7
toonz/sources/image/tzp/tmacro.h
file modified
+2 -2
toonz/sources/include/tcg/hpp/triangulate.hpp
file modified
+3 -3
toonz/sources/include/tgl.h
file modified
+4 -4
toonz/sources/include/tmachine.h
file modified
+6 -6
toonz/sources/include/toonz/preferences.h
file modified
+11 -2
toonz/sources/include/toonz/stage.h
file modified
+1 -0
toonz/sources/include/toonz/tcamera.h
file modified
+2 -1
toonz/sources/include/toonz/tcolumnfx.h
file modified
+7 -0
toonz/sources/include/toonz4.6/machine.h
file modified
+6 -13
toonz/sources/include/toonz4.6/pixel.h
file modified
+1 -1
toonz/sources/include/toonz4.6/tmacro.h
file modified
+2 -2
toonz/sources/include/toonzqt/camerasettingswidget.h
file modified
+5 -0
toonz/sources/include/tpixel.h
file modified
+7 -7
toonz/sources/include/tpixelutils.h
file modified
+3 -2
toonz/sources/include/traster.h
file modified
+7 -0
toonz/sources/mousedragfilter/CMakeLists.txt
file added
+10
toonz/sources/mousedragfilter/mousedragfilter.h
file added
+6
toonz/sources/mousedragfilter/mousedragfilter.mm
file added
+61
toonz/sources/stdfx/CMakeLists.txt
file modified
+8 -2
toonz/sources/stdfx/particlesfx.cpp
file modified
+2 -1
toonz/sources/stdfx/pins.cpp
file modified
+3 -3
toonz/sources/t32bitsrv/CMakeLists.txt
file modified
+4 -1
toonz/sources/t32bitsrv/t323gpmsg.cpp
file modified
+2 -2
toonz/sources/t32bitsrv/t32movmsg.cpp
file modified
+2 -2
toonz/sources/tnzbase/CMakeLists.txt
file modified
+9 -2
toonz/sources/tnzcore/CMakeLists.txt
file modified
+14 -4
toonz/sources/tnzext/CMakeLists.txt
file modified
+4 -1
toonz/sources/tnzext/tlin/tlin_superlu_wrap.cpp
file modified
+1 -1
toonz/sources/tnztools/CMakeLists.txt
file modified
+7 -1
toonz/sources/tnztools/stylepicker.cpp
file modified
+8 -8
toonz/sources/tnztools/tooloptions.cpp
file modified
+9 -0
toonz/sources/tnztools/vectortapetool.cpp
file modified
+1 -0
toonz/sources/toonz/CMakeLists.txt
file modified
+33 -17
toonz/sources/toonz/batchserversviewer.cpp
file modified
+2 -2
toonz/sources/toonz/brightnessandcontrastpopup.cpp
file modified
+1 -1
toonz/sources/toonz/cellselection.cpp
file modified
+7 -7
toonz/sources/toonz/cleanupsettingspane.cpp
file modified
+5 -5
toonz/sources/toonz/columncommand.cpp
file modified
+2 -2
toonz/sources/toonz/columnselection.cpp
file modified
+1 -1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+6 -6
toonz/sources/toonz/dvitemview.cpp
file modified
+6 -6
toonz/sources/toonz/exportlevelpopup.cpp
file modified
+19 -6
toonz/sources/toonz/exportlevelpopup.h
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
+37 -7
toonz/sources/toonz/fileselection.cpp
file modified
+2 -2
toonz/sources/toonz/floatingpanelcommand.cpp
file modified
+1 -1
toonz/sources/toonz/frameheadgadget.cpp
file modified
+1 -0
toonz/sources/toonz/frameheadgadget.h
file modified
+1 -0
toonz/sources/toonz/iocommand.cpp
file modified
+14 -6
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+15 -2
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+41 -4
toonz/sources/toonz/levelsettingspopup.h
file modified
+3 -0
toonz/sources/toonz/linesfadepopup.cpp
file modified
+1 -1
toonz/sources/toonz/main.cpp
file modified
+43 -5
toonz/sources/toonz/mainwindow.cpp
file modified
+40 -15
toonz/sources/toonz/mainwindow.h
file modified
+2 -1
toonz/sources/toonz/matchline.cpp
file modified
+2 -2
toonz/sources/toonz/menubarcommandids.h
file modified
+4 -1
toonz/sources/toonz/mergecmapped.cpp
file modified
+1 -1
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+1 -1
toonz/sources/toonz/penciltestpopup.cpp
file added
+1153
toonz/sources/toonz/penciltestpopup.h
file added
+133
toonz/sources/toonz/pltgizmopopup.cpp
file modified
+3 -3
toonz/sources/toonz/preferencespopup.cpp
file modified
+124 -30
toonz/sources/toonz/preferencespopup.h
file modified
+5 -2
toonz/sources/toonz/previewer.cpp
file modified
+1 -0
toonz/sources/toonz/print.cpp
file modified
+1 -1
toonz/sources/toonz/psdsettingspopup.cpp
file modified
+1 -1
toonz/sources/toonz/scanpopup.cpp
file modified
+1 -1
toonz/sources/toonz/sceneviewer.cpp
file modified
+3 -3
toonz/sources/toonz/sceneviewer.h
file modified
+4 -0
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+55 -8
toonz/sources/toonz/sceneviewercontextmenu.h
file modified
+14 -0
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+1 -0
toonz/sources/toonz/sceneviewerevents.h
file added
+8
toonz/sources/toonz/scriptconsolepanel.cpp
file modified
+9 -9
toonz/sources/toonz/shifttracetool.cpp
file modified
+2 -2
toonz/sources/toonz/shortcutpopup.cpp
file modified
+2 -3
toonz/sources/toonz/tapp.cpp
file modified
+1 -1
toonz/sources/toonz/viewerdraw.cpp
file modified
+3 -0
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+1 -1
toonz/sources/toonz/xsheetcmd.cpp
file modified
+7 -7
toonz/sources/toonz/xsheetdragtool.cpp
file modified
+1 -1
toonz/sources/toonz/xsheetviewer.cpp
file modified
+2 -2
toonz/sources/toonzfarm/tfarm/CMakeLists.txt
file modified
+3 -1
toonz/sources/toonzfarm/tfarm/tfarmexecutor.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/ttcpipclient.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt
file modified
+3 -1
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt
file modified
+3 -1
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tnzcore_stuff/tthread.cpp
file modified
+6 -6
toonz/sources/toonzlib/CMakeLists.txt
file modified
+5 -2
toonz/sources/toonzlib/autoclose.cpp
file modified
+1 -1
toonz/sources/toonzlib/fill.cpp
file modified
+2 -2
toonz/sources/toonzlib/fxcommand.cpp
file modified
+6 -6
toonz/sources/toonzlib/preferences.cpp
file modified
+47 -2
toonz/sources/toonzlib/sandor_fxs/CIL.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/CallCircle.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/EraseContour.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/PatternPosition.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/SDirection.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/STColSelPic.h
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+3 -3
toonz/sources/toonzlib/sandor_fxs/calligraph.cpp
file modified
+6 -6
toonz/sources/toonzlib/sandor_fxs/calligraph.h
file modified
+9 -1
toonz/sources/toonzlib/sandor_fxs/patternmap.cpp
file modified
+4 -7
toonz/sources/toonzlib/sandor_fxs/patternmap.h
file modified
+9 -1
toonz/sources/toonzlib/scenefx.cpp
file modified
+9 -9
toonz/sources/toonzlib/scriptbinding.cpp
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_outline_vectorizer.cpp
file modified
+3 -3
toonz/sources/toonzlib/scriptbinding_rasterizer.cpp
file modified
+8 -8
toonz/sources/toonzlib/scriptbinding_renderer.cpp
file modified
+3 -3
toonz/sources/toonzlib/stage.cpp
file modified
+4 -3
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+5 -7
toonz/sources/toonzlib/studiopalette.cpp
file modified
+2 -2
toonz/sources/toonzlib/tcamera.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcenterlineadjustments.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+13 -13
toonz/sources/toonzlib/tcenterlinepolygonizer.cpp
file modified
+4 -4
toonz/sources/toonzlib/tcenterlineskeletonizer.cpp
file modified
+3 -3
toonz/sources/toonzlib/tcenterlinevectorizer.cpp
file modified
+2 -2
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+12 -12
toonz/sources/toonzlib/tcolumnfxset.cpp
file modified
+1 -1
toonz/sources/toonzlib/texturemanager.cpp
file modified
+4 -4
toonz/sources/toonzlib/toonzimageutils.cpp
file modified
+4 -4
toonz/sources/toonzlib/toonzscene.cpp
file modified
+4 -3
toonz/sources/toonzlib/toutlinevectorizer.cpp
file modified
+6 -6
toonz/sources/toonzlib/trastercentroid.cpp
file modified
+1 -1
toonz/sources/toonzlib/trasterimageutils.cpp
file modified
+2 -0
toonz/sources/toonzlib/tstageobject.cpp
file modified
+1 -1
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+4 -5
toonz/sources/toonzqt/addfxcontextmenu.cpp
file modified
+1 -1
toonz/sources/toonzqt/camerasettingswidget.cpp
file modified
+34 -6
toonz/sources/toonzqt/docklayout.cpp
file modified
+3 -3
toonz/sources/toonzqt/docklayout.h
file modified
+2 -0
toonz/sources/toonzqt/dockwidget.cpp
file modified
+7 -0
toonz/sources/toonzqt/functionpanel.cpp
file modified
+2 -2
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/icongenerator.cpp
file modified
+4 -1
toonz/sources/toonzqt/imageutils.cpp
file modified
+21 -21
toonz/sources/toonzqt/pluginhost.cpp
file modified
+7 -7
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/stylenameeditor.cpp
file modified
+1 -1
toonz/sources/translations/chinese/colorfx.ts
file modified
+5 -1
toonz/sources/translations/chinese/tnztools.ts
file modified
+32 -0
toonz/sources/translations/chinese/toonz.ts
file modified
+186 -7
toonz/sources/translations/french/colorfx.ts
file modified
+4 -0
toonz/sources/translations/french/tnztools.ts
file modified
+4 -0
toonz/sources/translations/french/toonz.ts
file modified
+184 -3
toonz/sources/translations/german/colorfx.ts
file modified
+4 -0
toonz/sources/translations/german/tnztools.ts
file modified
+4 -0
toonz/sources/translations/german/toonz.ts
file modified
+184 -3
toonz/sources/translations/italian/colorfx.ts
file modified
+4 -0
toonz/sources/translations/italian/tnztools.ts
file modified
+4 -0
toonz/sources/translations/italian/toonz.ts
file modified
+184 -3
toonz/sources/translations/japanese/colorfx.ts
file modified
+4 -0
toonz/sources/translations/japanese/tnztools.ts
file modified
+4 -0
toonz/sources/translations/japanese/toonz.ts
file modified
+430 -5
toonz/sources/translations/spanish/colorfx.ts
file modified
+4 -0
toonz/sources/translations/spanish/tnztools.ts
file modified
+4 -0
toonz/sources/translations/spanish/toonz.ts
file modified
+184 -3
    Merge remote-tracking branch 'origin/master' into organize_palette
    
        
file modified
+3 -0
file modified
+2 -3
file modified
+58 -27
file modified
+56 -56
file modified
+51 -8
file modified
+3 -3
file modified
+4 -4
file modified
+3 -3
file modified
+43 -5
file modified
+1 -1