4b8460 Merge remote-tracking branch 'origin/master' into organize_palette

Merged and Committed by shun_iwasawa 8 years ago
98 files changed. 547 lines added. 425 lines removed.
appveyor.yml
file modified
+3 -2
stuff/profiles/layouts/rooms/Default/menubar_template.xml
file modified
+2 -0
stuff/profiles/layouts/rooms/Default/room1.ini
file modified
+12 -10
stuff/profiles/layouts/rooms/Default/room2.ini
file modified
+11 -9
stuff/profiles/layouts/rooms/Default/room3.ini
file modified
+7 -7
stuff/profiles/layouts/rooms/Default/room4.ini
file modified
+9 -9
stuff/profiles/layouts/rooms/Default/room5.ini
file modified
+10 -10
stuff/profiles/layouts/rooms/Default/room6.ini
file modified
+4 -4
stuff/profiles/layouts/rooms/Default/room7.ini
file modified
+2 -2
stuff/profiles/layouts/rooms/Default/room8.ini
file modified
+2 -2
stuff/projects/cleanupreslist.txt
file modified
+10 -6
stuff/projects/reslist.txt
file modified
+8 -6
toonz/install/SystemVar.ini
file modified
+10 -10
toonz/sources/colorfx/strokestyles.cpp
file modified
+2 -1
toonz/sources/common/tapptools/tcli.cpp
file modified
+2 -1
toonz/sources/common/tapptools/tcolorutils.cpp
file modified
+2 -1
toonz/sources/common/tcontenthistory.cpp
file modified
+1 -1
toonz/sources/common/tfx/trenderer.cpp
file modified
+2 -2
toonz/sources/common/tiio/tiio_std.cpp
file modified
+3 -0
toonz/sources/common/trop/quickput.cpp
file modified
+5 -6
toonz/sources/common/trop/tover.cpp
file modified
+2 -1
toonz/sources/common/trop/tropcm.cpp
file modified
+3 -2
toonz/sources/common/tsystem/tsystem.cpp
file modified
+1 -1
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+31 -24
toonz/sources/common/tvectorimage/tregion.cpp
file modified
+3 -1
toonz/sources/common/tvectorimage/tsweepboundary.cpp
file modified
+3 -4
toonz/sources/common/tvectorimage/tvectorimage.cpp
file modified
+2 -1
toonz/sources/common/tvrender/tflash.cpp
file modified
+2 -1
toonz/sources/common/tvrender/tinbetween.cpp
file modified
+4 -3
toonz/sources/common/tvrender/ttessellator.cpp
file modified
+2 -2
toonz/sources/common/twain/twain.h
file modified
+4 -1
toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
file modified
+18 -18
toonz/sources/image/ffmpeg/tiio_ffmpeg.h
file modified
+1 -1
toonz/sources/image/ffmpeg/tiio_gif.cpp
file modified
+7 -9
toonz/sources/image/ffmpeg/tiio_mp4.cpp
file modified
+5 -4
toonz/sources/image/ffmpeg/tiio_webm.cpp
file modified
+7 -6
toonz/sources/image/ffmpeg/tiio_webm.h
file modified
+2 -2
toonz/sources/image/pli/tiio_pli.cpp
file modified
+2 -1
toonz/sources/image/pli/tiio_pli.h
file modified
+1 -2
toonz/sources/image/quantel/filequantel.c
file modified
+4 -3
toonz/sources/image/svg/tiio_svg.cpp
file modified
+4 -3
toonz/sources/image/tiio.cpp
file modified
+20 -23
toonz/sources/image/tzl/tiio_tzl.cpp
file modified
+7 -12
toonz/sources/include/toonz/preferences.h
file modified
+1 -1
toonz/sources/include/toonz/tcolumnfx.h
file modified
+1 -2
toonz/sources/include/toonzqt/camerasettingswidget.h
file modified
+1 -0
toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h
file modified
+1 -1
toonz/sources/sound/aiff/tsio_aiff.cpp
file modified
+0 -1
toonz/sources/sound/tsioutils.h
file modified
+1 -2
toonz/sources/stdfx/backlitfx.cpp
file modified
+6 -4
toonz/sources/stdfx/iwa_particlesengine.cpp
file modified
+2 -1
toonz/sources/stdfx/pins.cpp
file modified
+2 -2
toonz/sources/stdfx/shadingcontext.cpp
file modified
+25 -3
toonz/sources/tnzbase/tscanner/tscannertwain.cpp
file modified
+4 -3
toonz/sources/tnztools/geometrictool.cpp
file modified
+2 -2
toonz/sources/tnztools/imagegrouping.cpp
file modified
+3 -3
toonz/sources/tnztools/plastictool.cpp
file modified
+6 -4
toonz/sources/tnztools/skeletontool.cpp
file modified
+2 -2
toonz/sources/toonz/CMakeLists.txt
file modified
+1 -1
toonz/sources/toonz/camerasettingspopup.cpp
file modified
+5 -0
toonz/sources/toonz/cellselection.cpp
file modified
+4 -2
toonz/sources/toonz/cleanupsettingspane.cpp
file modified
+2 -1
toonz/sources/toonz/dvitemview.cpp
file modified
+2 -2
toonz/sources/toonz/exportlevelpopup.cpp
file modified
+23 -23
toonz/sources/toonz/formatsettingspopups.cpp
file modified
+3 -1
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+4 -0
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+4 -2
toonz/sources/toonz/main.cpp
file modified
+3 -3
toonz/sources/toonz/mainwindow.cpp
file modified
+18 -15
toonz/sources/toonz/matchline.cpp
file modified
+2 -2
toonz/sources/toonz/menubar.cpp
file modified
+2 -1
toonz/sources/toonz/pltgizmopopup.cpp
file modified
+2 -1
toonz/sources/toonz/preferencespopup.cpp
file modified
+22 -20
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+2 -2
toonz/sources/toonz/scriptconsolepanel.cpp
file modified
+6 -3
toonz/sources/toonz/shortcutpopup.cpp
file modified
+1 -3
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+2 -1
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+2 -1
toonz/sources/toonzlib/fill.cpp
file modified
+2 -1
toonz/sources/toonzlib/fxcommand.cpp
file modified
+4 -4
toonz/sources/toonzlib/preferences.cpp
file modified
+6 -8
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+2 -2
toonz/sources/toonzlib/sandor_fxs/calligraph.cpp
file modified
+6 -6
toonz/sources/toonzlib/sandor_fxs/patternmap.cpp
file modified
+4 -2
toonz/sources/toonzlib/scenefx.cpp
file modified
+5 -3
toonz/sources/toonzlib/scriptbinding_outline_vectorizer.cpp
file modified
+3 -2
toonz/sources/toonzlib/scriptbinding_rasterizer.cpp
file modified
+6 -4
toonz/sources/toonzlib/scriptbinding_renderer.cpp
file modified
+2 -2
toonz/sources/toonzlib/stagevisitor.cpp
file modified
+4 -4
toonz/sources/toonzlib/tcenterlinecolors.cpp
file modified
+4 -4
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+21 -19
toonz/sources/toonzlib/toonzimageutils.cpp
file modified
+3 -3
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+5 -3
toonz/sources/toonzqt/camerasettingswidget.cpp
file modified
+34 -10
toonz/sources/toonzqt/cleanupcamerasettingswidget.cpp
file modified
+8 -1
toonz/sources/toonzqt/docklayout.cpp
file modified
+4 -2
toonz/sources/toonzqt/imageutils.cpp
file modified
+12 -13
toonz/sources/toonzqt/pluginhost.cpp
file modified
+3 -3
    Merge remote-tracking branch 'origin/master' into organize_palette
    
        
file modified
+3 -2
file modified
+8 -6
file modified
+10 -10
file modified
+20 -23
file modified
+2 -2
file modified
+3 -3