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

Merged and Committed by shun_iwasawa 8 years ago
177 files changed. 2792 lines added. 697 lines removed.
README.md
file modified
+3 -0
appveyor.yml
file added
+42
doc/README_ja.md
file modified
+6 -1
plugins/blur/CMakeLists.txt
file modified
+6 -3
plugins/geom/CMakeLists.txt
file modified
+6 -3
plugins/multiplugin/CMakeLists.txt
file modified
+6 -3
toonz/sources/CMakeLists.txt
file modified
+16 -7
toonz/sources/colorfx/CMakeLists.txt
file modified
+4 -2
toonz/sources/colorfx/regionstyles.cpp
file modified
+1 -1
toonz/sources/common/expressions/tgrammar.cpp
file modified
+16 -14
toonz/sources/common/psdlib/psd.cpp
file modified
+1 -1
toonz/sources/common/tapptools/tcli.cpp
file modified
+1 -1
toonz/sources/common/tapptools/tcolorutils.cpp
file modified
+3 -3
toonz/sources/common/tcolor/tpixel.cpp
file modified
+3 -3
toonz/sources/common/tcontenthistory.cpp
file modified
+2 -2
toonz/sources/common/tiio/bmp/filebmp.c
file modified
+2 -20
toonz/sources/common/tiio/tiio_jpg.cpp
file modified
+3 -1
toonz/sources/common/timage_io/timage_io.cpp
file modified
+1 -1
toonz/sources/common/tmeshimage/tmeshimage.cpp
file modified
+1 -1
toonz/sources/common/tparam/tdoubleparam.cpp
file modified
+2 -2
toonz/sources/common/tparam/ttonecurveparam.cpp
file modified
+1 -1
toonz/sources/common/trop/quickput.cpp
file modified
+1 -0
toonz/sources/common/trop/quickputP.h
file modified
+5 -0
toonz/sources/common/trop/tconvert.cpp
file modified
+9 -9
toonz/sources/common/trop/tdespeckle.cpp
file modified
+2 -2
toonz/sources/common/trop/tover.cpp
file modified
+1 -1
toonz/sources/common/trop/tropcm.cpp
file modified
+2 -2
toonz/sources/common/tsound/tsound_sdl.cpp
file modified
+1 -1
toonz/sources/common/tstream/tpersistset.cpp
file modified
+1 -1
toonz/sources/common/tstream/tstream.cpp
file modified
+2 -2
toonz/sources/common/tunit/tunit.cpp
file modified
+1 -1
toonz/sources/common/tvectorimage/cornerdetector.cpp
file modified
+6 -5
toonz/sources/common/tvectorimage/cornerdetector.h
file added
+10
toonz/sources/common/tvectorimage/outlineApproximation.cpp
file modified
+3 -3
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+44 -43
toonz/sources/common/tvectorimage/tcomputeregions.h
file added
+9
toonz/sources/common/tvectorimage/tregion.cpp
file modified
+2 -2
toonz/sources/common/tvectorimage/tstroke.cpp
file modified
+1 -4
toonz/sources/common/tvectorimage/tsweepboundary.cpp
file modified
+8 -8
toonz/sources/common/tvectorimage/tvectorimage.cpp
file modified
+7 -7
toonz/sources/common/tvectorimage/tvectorimageP.h
file modified
+7 -0
toonz/sources/common/tvrender/tcolorstyles.cpp
file modified
+2 -2
toonz/sources/common/tvrender/tflash.cpp
file modified
+11 -11
toonz/sources/common/tvrender/tglregions.cpp
file modified
+2 -2
toonz/sources/common/tvrender/tinbetween.cpp
file modified
+27 -27
toonz/sources/common/tvrender/tofflinegl.cpp
file modified
+1 -1
toonz/sources/common/tvrender/tpalette.cpp
file modified
+1 -1
toonz/sources/common/tvrender/tsimplecolorstyles.cpp
file modified
+1 -1
toonz/sources/common/tvrender/ttessellator.cpp
file modified
+7 -3
toonz/sources/common/twain/ttwain.h
file modified
+1 -1
toonz/sources/common/twain/twain.h
file modified
+3 -1
toonz/sources/image/CMakeLists.txt
file modified
+38 -20
toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
file added
+418
toonz/sources/image/ffmpeg/tiio_ffmpeg.h
file added
+57
toonz/sources/image/ffmpeg/tiio_gif.cpp
file added
+251
toonz/sources/image/ffmpeg/tiio_gif.h
file added
+90
toonz/sources/image/ffmpeg/tiio_mp4.cpp
file added
+220
toonz/sources/image/ffmpeg/tiio_mp4.h
file added
+88
toonz/sources/image/ffmpeg/tiio_webm.cpp
file added
+224
toonz/sources/image/ffmpeg/tiio_webm.h
file added
+88
toonz/sources/image/mesh/tiio_mesh.h
file modified
+1 -1
toonz/sources/image/pli/pli_io.cpp
file modified
+1 -1
toonz/sources/image/pli/tiio_pli.cpp
file modified
+4 -4
toonz/sources/image/pli/tiio_pli.h
file modified
+6 -0
toonz/sources/image/png/tiio_png.cpp
file modified
+15 -20
toonz/sources/image/quantel/filequantel.c
file modified
+3 -3
toonz/sources/image/sgi/filesgi.cpp
file modified
+1 -1
toonz/sources/image/svg/tiio_svg.cpp
file modified
+6 -6
toonz/sources/image/tga/tiio_tga.cpp
file modified
+2 -2
toonz/sources/image/tiio.cpp
file modified
+32 -0
toonz/sources/image/tzl/tiio_tzl.cpp
file modified
+10 -10
toonz/sources/image/tzp/avl.c
file modified
+2 -2
toonz/sources/image/tzp/tiio_plt.cpp
file modified
+2 -2
toonz/sources/include/tdoubleparam.h
file modified
+4 -0
toonz/sources/include/tlevel_io.h
file modified
+2 -1
toonz/sources/include/toonz/preferences.h
file modified
+13 -2
toonz/sources/include/tpersistset.h
file modified
+1 -1
toonz/sources/include/tspectrum.h
file modified
+2 -0
toonz/sources/sound/CMakeLists.txt
file modified
+4 -2
toonz/sources/sound/aiff/tsio_aiff.cpp
file modified
+6 -7
toonz/sources/sound/tsioutils.cpp
file modified
+2 -0
toonz/sources/sound/tsioutils.h
file added
+9
toonz/sources/stdfx/CMakeLists.txt
file modified
+4 -2
toonz/sources/stdfx/backlitfx.cpp
file modified
+4 -4
toonz/sources/stdfx/changecolorfx.cpp
file modified
+1 -1
toonz/sources/stdfx/gradients.cpp
file modified
+3 -0
toonz/sources/stdfx/iwa_particlesengine.cpp
file modified
+1 -1
toonz/sources/stdfx/motionblurfx.cpp
file modified
+2 -2
toonz/sources/stdfx/particlesengine.cpp
file modified
+1 -1
toonz/sources/stdfx/pins.cpp
file modified
+7 -7
toonz/sources/stdfx/shadingcontext.cpp
file modified
+4 -4
toonz/sources/stdfx/stdfx.cpp
file modified
+3 -0
toonz/sources/stdfx/stdfx.h
file modified
+2 -0
toonz/sources/t32bitsrv/CMakeLists.txt
file modified
+6 -3
toonz/sources/tcleanupper/CMakeLists.txt
file modified
+4 -2
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+7 -7
toonz/sources/tcomposer/CMakeLists.txt
file modified
+4 -2
toonz/sources/tcomposer/tcomposer.cpp
file modified
+4 -4
toonz/sources/tconverter/CMakeLists.txt
file modified
+4 -2
toonz/sources/tnzbase/CMakeLists.txt
file modified
+24 -12
toonz/sources/tnzbase/tscanner/tscannerepson.cpp
file modified
+2 -2
toonz/sources/tnzbase/tscanner/tscannertwain.cpp
file modified
+10 -5
toonz/sources/tnzcore/CMakeLists.txt
file modified
+24 -12
toonz/sources/tnzext/CMakeLists.txt
file modified
+12 -6
toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
file modified
+1 -1
toonz/sources/tnztools/CMakeLists.txt
file modified
+6 -3
toonz/sources/tnztools/brushtool.cpp
file modified
+9 -9
toonz/sources/tnztools/geometrictool.cpp
file modified
+6 -6
toonz/sources/tnztools/imagegrouping.cpp
file modified
+5 -5
toonz/sources/tnztools/plastictool.cpp
file modified
+5 -5
toonz/sources/tnztools/plastictool.h
file modified
+3 -3
toonz/sources/tnztools/plastictool_meshedit.cpp
file modified
+8 -8
toonz/sources/tnztools/plastictool_rigidity.cpp
file modified
+2 -2
toonz/sources/tnztools/skeletontool.cpp
file modified
+6 -6
toonz/sources/tnztools/strokeselection.cpp
file modified
+1 -1
toonz/sources/tnztools/toolhandle.cpp
file modified
+1 -1
toonz/sources/tnztools/toolutils.cpp
file modified
+2 -3
toonz/sources/tnztools/trackertool.cpp
file modified
+1 -1
toonz/sources/tnztools/typetool.cpp
file modified
+1 -1
toonz/sources/toonz/CMakeLists.txt
file modified
+24 -8
toonz/sources/toonz/adjustthicknesspopup.cpp
file modified
+1 -1
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+4 -4
toonz/sources/toonz/columncommand.cpp
file modified
+2 -2
toonz/sources/toonz/drawingdata.cpp
file modified
+1 -1
toonz/sources/toonz/exportlevelcommand.cpp
file modified
+3 -3
toonz/sources/toonz/exportlevelpopup.cpp
file modified
+1 -1
toonz/sources/toonz/filmstrip.cpp
file modified
+50 -5
toonz/sources/toonz/formatsettingspopups.cpp
file modified
+3 -1
toonz/sources/toonz/frameheadgadget.cpp
file modified
+0 -1
toonz/sources/toonz/insertfxpopup.cpp
file modified
+1 -1
toonz/sources/toonz/iocommand.cpp
file modified
+9 -9
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+1 -1
toonz/sources/toonz/loadfoldercommand.cpp
file modified
+2 -2
toonz/sources/toonz/main.cpp
file modified
+1 -1
toonz/sources/toonz/mainwindow.cpp
file modified
+14 -2
toonz/sources/toonz/meshifypopup.cpp
file modified
+4 -3
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+7 -0
toonz/sources/toonz/penciltestpopup.cpp
file modified
+155 -5
toonz/sources/toonz/penciltestpopup.h
file modified
+35 -2
toonz/sources/toonz/preferencespopup.cpp
file modified
+84 -3
toonz/sources/toonz/preferencespopup.h
file modified
+6 -1
toonz/sources/toonz/rendercommand.cpp
file modified
+30 -14
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+28 -31
toonz/sources/toonz/sceneviewercontextmenu.h
file modified
+8 -9
toonz/sources/toonz/shortcutpopup.cpp
file modified
+40 -38
toonz/sources/toonz/shortcutpopup.h
file modified
+5 -5
toonz/sources/toonz/tasksviewer.cpp
file modified
+2 -1
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+4 -3
toonz/sources/toonz/vectorizerswatch.cpp
file modified
+2 -2
toonz/sources/toonz/vectorizerswatch.h
file modified
+1 -1
toonz/sources/toonz/xsheetcmd.cpp
file modified
+4 -2
toonz/sources/toonzfarm/tfarm/CMakeLists.txt
file modified
+10 -5
toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt
file modified
+4 -2
toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt
file modified
+4 -2
toonz/sources/toonzlib/CMakeLists.txt
file modified
+10 -5
toonz/sources/toonzlib/doubleparamcmd.cpp
file modified
+0 -4
toonz/sources/toonzlib/fxcommand.cpp
file modified
+30 -30
toonz/sources/toonzlib/imagebuilders.cpp
file modified
+9 -0
toonz/sources/toonzlib/movierenderer.cpp
file modified
+1 -1
toonz/sources/toonzlib/palettecmd.cpp
file modified
+1 -1
toonz/sources/toonzlib/palettecontroller.cpp
file modified
+4 -3
toonz/sources/toonzlib/plasticdeformerfx.cpp
file modified
+2 -2
toonz/sources/toonzlib/preferences.cpp
file modified
+29 -2
toonz/sources/toonzlib/sandor_fxs/calligraph.cpp
file modified
+1 -0
toonz/sources/toonzlib/screensavermaker.cpp
file modified
+4 -4
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+13 -4
toonz/sources/toonzlib/toonzscene.cpp
file modified
+1 -1
toonz/sources/toonzlib/txsheetexpr.cpp
file modified
+17 -14
toonz/sources/toonzqt/CMakeLists.txt
file modified
+8 -4
toonz/sources/toonzqt/addfxcontextmenu.cpp
file modified
+7 -6
toonz/sources/toonzqt/colorfield.cpp
file modified
+4 -2
toonz/sources/toonzqt/dvdialog.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionpaneltools.cpp
file modified
+0 -6
toonz/sources/toonzqt/keyframenavigator.cpp
file modified
+1 -1
toonz/sources/toonzqt/paletteviewergui.cpp
file modified
+0 -1
toonz/sources/toonzqt/rasterimagedata.cpp
file modified
+1 -1
toonz/sources/toonzqt/styleselection.cpp
file modified
+2 -2
    Merge remote-tracking branch 'origin/master' into organize_palette
    
        
file modified
+3 -0
file added
+42
file modified
+6 -1
file modified
+6 -3
file modified
+6 -3
file modified
+16 -7
file modified
+32 -0
file modified
+7 -7
file modified
+2 -0
file modified
+1 -1