013320 Merge remote-tracking branch 'origin/master' into revert_room_feature

Merged and Committed by shun_iwasawa 9 years ago
243 files changed. 919 lines added. 8512 lines removed.
.gitignore
file modified
+1 -0
doc/how_to_build_macosx.md
file modified
+16 -8
thirdparty/lzo/driver/CMakeLists.txt
file modified
+8 -3
thirdparty/lzo/driver/lzocompress.c
file modified
+4 -0
thirdparty/lzo/driver/lzodecompress.c
file modified
+4 -0
thirdparty/superlu/SuperLU_4.1/FORTRAN/c_fortran_dgssv.c.bak
file removed
-175
thirdparty/superlu/SuperLU_4.1/SRC/cgsitrf.c.bak
file removed
-629
thirdparty/superlu/SuperLU_4.1/SRC/cgssvx.c.bak
file removed
-619
thirdparty/superlu/SuperLU_4.1/SRC/clacon.c.bak
file removed
-221
thirdparty/superlu/SuperLU_4.1/SRC/dgsitrf.c.bak
file removed
-626
thirdparty/superlu/SuperLU_4.1/SRC/dlacon.c.bak
file removed
-236
thirdparty/superlu/SuperLU_4.1/SRC/ilu_ccopy_to_ucol.c.bak
file removed
-202
thirdparty/superlu/SuperLU_4.1/SRC/ilu_dcopy_to_ucol.c.bak
file removed
-199
thirdparty/superlu/SuperLU_4.1/SRC/ilu_ddrop_row.c.bak
file removed
-311
thirdparty/superlu/SuperLU_4.1/SRC/ilu_scopy_to_ucol.c.bak
file removed
-199
thirdparty/superlu/SuperLU_4.1/SRC/ilu_zcopy_to_ucol.c.bak
file removed
-202
thirdparty/superlu/SuperLU_4.1/SRC/mc64ad.f.bak
file removed
-2002
thirdparty/superlu/SuperLU_4.1/SRC/sgsitrf.c.bak
file removed
-626
thirdparty/superlu/SuperLU_4.1/SRC/slacon.c.bak
file removed
-236
thirdparty/superlu/SuperLU_4.1/SRC/zgsitrf.c.bak
file removed
-629
thirdparty/superlu/SuperLU_4.1/SRC/zlacon.c.bak
file removed
-221
thirdparty/superlu/SuperLU_4.1/TESTING/MATGEN/Cnames.h.bak
file removed
-197
toonz/cmake/FindLZO.cmake
file modified
+1 -1
toonz/cmake/FindSuperLU.cmake
file modified
+1 -1
toonz/cmake/FindTIFF.cmake
file modified
+1 -1
toonz/sources/CMakeLists.txt
file modified
+2 -2
toonz/sources/common/expressions/texpression.cpp
file modified
+0 -1
toonz/sources/common/expressions/tgrammar.cpp
file modified
+1 -1
toonz/sources/common/expressions/tparser.cpp
file modified
+0 -1
toonz/sources/common/tapptools/tcli.cpp
file modified
+1 -2
toonz/sources/common/tapptools/ttimer.cpp
file modified
+1 -2
toonz/sources/common/tcache/timagecache.cpp
file modified
+0 -1
toonz/sources/common/tcolor/tcolorfunctions.cpp
file modified
+1 -1
toonz/sources/common/tcore/tthread.cpp
file modified
+1 -1
toonz/sources/common/tcore/tundo.cpp
file modified
+0 -2
toonz/sources/common/tfx/tfx.cpp
file modified
+1 -2
toonz/sources/common/tfx/tfxcachemanager.cpp
file modified
+0 -2
toonz/sources/common/tfx/tpredictivecachemanager.cpp
file modified
+21 -16
toonz/sources/common/tfx/ttzpimagefx.cpp
file modified
+2 -2
toonz/sources/common/tgeometry/tcurveutil.cpp
file modified
+2 -1
toonz/sources/common/tgl/tgl.cpp
file modified
+6 -4
toonz/sources/common/tgl/tstencilcontrol.cpp
file modified
+0 -1
toonz/sources/common/tiio/compatibility/tfile_io.h
file modified
+1 -1
toonz/sources/common/tipc/tipc.cpp
file modified
+3 -0
toonz/sources/common/tmeshimage/tmeshimage.cpp
file modified
+2 -3
toonz/sources/common/tparam/tdoubleparam.cpp
file modified
+1 -2
toonz/sources/common/tparam/tnotanimatableparam.cpp
file modified
+1 -2
toonz/sources/common/tparam/tparamcontainer.cpp
file modified
+0 -1
toonz/sources/common/tparam/tparamset.cpp
file modified
+2 -3
toonz/sources/common/tparam/tspectrumparam.cpp
file modified
+3 -5
toonz/sources/common/trop/brush.cpp
file modified
+1 -1
toonz/sources/common/trop/tdistancetransform.cpp
file modified
+2 -5
toonz/sources/common/trop/trop_borders.cpp
file modified
+0 -1
toonz/sources/common/tsound/tsop.cpp
file modified
+2 -0
toonz/sources/common/tsound/tsound_mac.cpp
file modified
+12 -10
toonz/sources/common/tsound/tsound_nt.cpp
file modified
+3 -5
toonz/sources/common/tstream/tstream.cpp
file modified
+4 -6
toonz/sources/common/tsystem/tlogger.cpp
file modified
+1 -45
toonz/sources/common/tsystem/tpluginmanager.cpp
file modified
+3 -1
toonz/sources/common/tsystem/tsystem.cpp
file modified
+14 -14
toonz/sources/common/tsystem/tsystempd.cpp
file modified
+5 -0
toonz/sources/common/ttest/ttest.cpp
file modified
+4 -0
toonz/sources/common/tvectorimage/tl2lautocloser.cpp
file modified
+0 -2
toonz/sources/common/tvectorimage/tl2lautocloser.h
file modified
+3 -3
toonz/sources/common/tvectorimage/tregion.cpp
file modified
+0 -1
toonz/sources/common/tvectorimage/tstroke.cpp
file modified
+14 -23
toonz/sources/common/tvectorimage/tvectorimage.cpp
file modified
+4 -2
toonz/sources/common/tvrender/qtofflinegl.cpp
file modified
+6 -4
toonz/sources/common/tvrender/tinbetween.cpp
file modified
+0 -1
toonz/sources/common/tvrender/tofflinegl.cpp
file modified
+15 -19
toonz/sources/common/tvrender/tpalette.cpp
file modified
+2 -0
toonz/sources/common/tvrender/tstrokedeformations.cpp
file modified
+2 -3
toonz/sources/common/tvrender/ttessellator.cpp
file modified
+1 -1
toonz/sources/common/twain/twain.h
file modified
+5 -0
toonz/sources/image/compatibility/tfile_io.h
file modified
+4 -0
toonz/sources/image/png/tiio_png.cpp
file modified
+11 -11
toonz/sources/image/tzl/tiio_tzl.cpp
file modified
+1 -1
toonz/sources/include/ext/meshtexturizer.h
file modified
+3 -3
toonz/sources/include/ext/plasticdeformer.h
file modified
+3 -3
toonz/sources/include/ext/plasticdeformerstorage.h
file modified
+3 -3
toonz/sources/include/ext/plasticskeleton.h
file modified
+4 -8
toonz/sources/include/ext/plasticskeletondeformation.h
file modified
+3 -3
toonz/sources/include/ext/plasticvisualsettings.h
file modified
+1 -1
toonz/sources/include/ext/ttexturesstorage.h
file modified
+3 -6
toonz/sources/include/permissionsmanager.h
file modified
+3 -3
toonz/sources/include/qtofflinegl.h
file modified
+4 -4
toonz/sources/include/stdfx/shadingcontext.h
file modified
+3 -3
toonz/sources/include/tcg/hpp/triangulate.hpp
file modified
+3 -0
toonz/sources/include/tcli.h
file modified
+3 -3
toonz/sources/include/tcontenthistory.h
file modified
+2 -2
toonz/sources/include/tconvert.h
file modified
+1 -1
toonz/sources/include/tdoubleparam.h
file modified
+3 -3
toonz/sources/include/texpression.h
file modified
+3 -3
toonz/sources/include/tfarmserver.h
file modified
+3 -5
toonz/sources/include/tfarmtask.h
file modified
+4 -4
toonz/sources/include/tfx.h
file modified
+2 -2
toonz/sources/include/tfxcachemanager.h
file modified
+3 -3
toonz/sources/include/tgeometry.h
file modified
+1 -1
toonz/sources/include/tgrammar.h
file modified
+3 -3
toonz/sources/include/timagecache.h
file modified
+3 -3
toonz/sources/include/tinbetween.h
file modified
+2 -5
toonz/sources/include/tlogger.h
file modified
+3 -3
toonz/sources/include/tmeshimage.h
file modified
+4 -4
toonz/sources/include/tmsgcore.h
file modified
+1 -1
toonz/sources/include/tnotanimatableparam.h
file modified
+3 -3
toonz/sources/include/tnztypes.h
file modified
+1 -1
toonz/sources/include/tofflinegl.h
file modified
+5 -7
toonz/sources/include/tools/strokeselection.h
file modified
+3 -6
toonz/sources/include/toonz/autoclose.h
file modified
+3 -3
toonz/sources/include/toonz/doubleparamcmd.h
file modified
+1 -1
toonz/sources/include/toonz/ikengine.h
file modified
+1 -1
toonz/sources/include/toonz/ikjacobian.h
file modified
+1 -1
toonz/sources/include/toonz/iknode.h
file modified
+1 -1
toonz/sources/include/toonz/ikskeleton.h
file modified
+1 -1
toonz/sources/include/toonz/imagemanager.h
file modified
+3 -3
toonz/sources/include/toonz/preferences.h
file modified
+3 -6
toonz/sources/include/toonz/scriptbinding_files.h
file modified
+1 -1
toonz/sources/include/toonz/tlog.h
file modified
+3 -3
toonz/sources/include/toonz/tstageobjecttree.h
file modified
+3 -3
toonz/sources/include/toonz/ttileset.h
file modified
+1 -1
toonz/sources/include/toonz/txsheet.h
file modified
+3 -3
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+4 -7
toonz/sources/include/toonzqt/functionpanel.h
file modified
+1 -0
toonz/sources/include/toonzqt/infoviewer.h
file modified
+3 -3
toonz/sources/include/toonzqt/schematicgroupeditor.h
file modified
+1 -1
toonz/sources/include/toonzqt/styleindexlineedit.h
file modified
+1 -1
toonz/sources/include/tparamcontainer.h
file modified
+3 -3
toonz/sources/include/tparser.h
file modified
+3 -3
toonz/sources/include/tpersistset.h
file modified
+2 -0
toonz/sources/include/tpixel.h
file modified
+3 -1
toonz/sources/include/tpredictivecachemanager.h
file modified
+3 -3
toonz/sources/include/tregion.h
file modified
+3 -3
toonz/sources/include/trop_borders.h
file modified
+3 -3
toonz/sources/include/tscanner.h
file modified
+1 -1
toonz/sources/include/tsmartpointer.h
file modified
+4 -4
toonz/sources/include/tsound.h
file modified
+4 -4
toonz/sources/include/tsound_t.h
file modified
+2 -2
toonz/sources/include/tspectrumparam.h
file modified
+3 -3
toonz/sources/include/tstencilcontrol.h
file modified
+3 -3
toonz/sources/include/tstream.h
file modified
+7 -7
toonz/sources/include/tstroke.h
file modified
+3 -3
toonz/sources/include/tsystem.h
file modified
+1 -1
toonz/sources/include/ttcpip.h
file modified
+3 -3
toonz/sources/include/tthread.h
file modified
+1 -1
toonz/sources/include/ttimer.h
file modified
+3 -3
toonz/sources/include/tundo.h
file modified
+3 -3
toonz/sources/include/tvectorimage.h
file modified
+3 -3
toonz/sources/stdfx/CMakeLists.txt
file modified
+158 -158
toonz/sources/stdfx/igs_motion_blur.cpp
file modified
+1 -0
toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
file modified
+1 -0
toonz/sources/stdfx/iwa_particles.cpp
file modified
+0 -1
toonz/sources/stdfx/particles.cpp
file modified
+3 -1
toonz/sources/stdfx/shaderfx.cpp
file modified
+0 -3
toonz/sources/stdfx/shadingcontext.cpp
file modified
+0 -1
toonz/sources/tnzbase/permissionsmanager.cpp
file modified
+1 -2
toonz/sources/tnzbase/tscanner/tscannerutil.cpp
file modified
+2 -0
toonz/sources/tnzext/meshtexturizer.cpp
file modified
+3 -8
toonz/sources/tnzext/plasticdeformer.cpp
file modified
+2 -1
toonz/sources/tnzext/plasticdeformerstorage.cpp
file modified
+3 -7
toonz/sources/tnzext/plastichandle.cpp
file modified
+2 -0
toonz/sources/tnzext/plasticskeleton.cpp
file modified
+0 -15
toonz/sources/tnzext/plasticskeletondeformation.cpp
file modified
+0 -2
toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
file modified
+1 -0
toonz/sources/tnzext/ttexturesstorage.cpp
file modified
+2 -5
toonz/sources/tnztools/CMakeLists.txt
file modified
+4 -4
toonz/sources/tnztools/autofilltlv.cpp
file modified
+1 -1
toonz/sources/tnztools/plastictool.cpp
file modified
+1 -1
toonz/sources/tnztools/skeletonsubtools.cpp
file modified
+1 -1
toonz/sources/tnztools/stylepicker.cpp
file modified
+2 -2
toonz/sources/tnztools/typetool.cpp
file modified
+2 -1
toonz/sources/toonz/CMakeLists.txt
file modified
+19 -22
toonz/sources/toonz/ObjectTracker.cpp
file modified
+0 -3
toonz/sources/toonz/adjustlevelspopup.cpp
file modified
+0 -1
toonz/sources/toonz/batches.cpp
file modified
+5 -5
toonz/sources/toonz/batches.h
file modified
+2 -2
toonz/sources/toonz/castviewer.cpp
file modified
+0 -2
toonz/sources/toonz/cellselection.cpp
file modified
+0 -1
toonz/sources/toonz/cleanuppopup.h
file modified
+5 -6
toonz/sources/toonz/columncommand.cpp
file modified
+2 -1
toonz/sources/toonz/comboviewerpane.cpp
file modified
+10 -0
toonz/sources/toonz/exportpanel.cpp
file modified
+1 -1
toonz/sources/toonz/fileselection.cpp
file modified
+1 -1
toonz/sources/toonz/filmstripcommand.cpp
file modified
+1 -1
toonz/sources/toonz/history.h
file modified
+1 -1
toonz/sources/toonz/insertfxpopup.cpp
file modified
+2 -0
toonz/sources/toonz/insertfxpopup.h
file modified
+1 -1
toonz/sources/toonz/iocommand.cpp
file modified
+4 -3
toonz/sources/toonz/iocommand.h
file modified
+3 -4
toonz/sources/toonz/keyframeselection.cpp
file modified
+1 -1
toonz/sources/toonz/matchline.cpp
file modified
+1 -2
toonz/sources/toonz/mergecmapped.cpp
file modified
+1 -2
toonz/sources/toonz/mergecolumns.cpp
file modified
+1 -2
toonz/sources/toonz/moviegenerator.cpp
file modified
+3 -5
toonz/sources/toonz/moviegenerator.h
file modified
+3 -3
toonz/sources/toonz/previewer.cpp
file modified
+0 -1
toonz/sources/toonz/previewer.h
file modified
+3 -3
toonz/sources/toonz/scanpopup.cpp
file modified
+1 -1
toonz/sources/toonz/scenesettingspopup.cpp
file modified
+1 -1
toonz/sources/toonz/sceneviewercontextmenu.cpp
file modified
+0 -2
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+10 -0
toonz/sources/toonz/tasksviewer.cpp
file modified
+0 -1
toonz/sources/toonz/vectorizerpopup.h
file modified
+3 -6
toonz/sources/toonz/vectorizerswatch.h
file modified
+2 -0
toonz/sources/toonz/viewerdraw.cpp
file modified
+1 -1
toonz/sources/toonz/xshcellmover.cpp
file modified
+1 -1
toonz/sources/toonz/xshcellviewer.cpp
file modified
+0 -1
toonz/sources/toonzfarm/include/service.h
file modified
+2 -4
toonz/sources/toonzfarm/include/tlog.h
file modified
+3 -3
toonz/sources/toonzfarm/tfarm/service.cpp
file modified
+0 -1
toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp
file modified
+0 -1
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+1 -2
toonz/sources/toonzfarm/tfarm/tlog.cpp
file modified
+0 -1
toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp
file modified
+8 -11
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+10 -0
toonz/sources/toonzlib/autoclose.cpp
file modified
+1 -2
toonz/sources/toonzlib/autopos.cpp
file modified
+1 -1
toonz/sources/toonzlib/doubleparamcmd.cpp
file modified
+3 -3
toonz/sources/toonzlib/fxcommand.cpp
file modified
+2 -0
toonz/sources/toonzlib/imagemanager.cpp
file modified
+0 -1
toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/YOMBParam.h
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_renderer.cpp
file modified
+0 -2
toonz/sources/toonzlib/studiopalettecmd.cpp
file modified
+1 -1
toonz/sources/toonzlib/tlog.cpp
file modified
+1 -2
toonz/sources/toonzlib/trastercentroid.cpp
file modified
+1 -1
toonz/sources/toonzlib/tstageobject.cpp
file modified
+2 -2
toonz/sources/toonzlib/tstageobjecttree.cpp
file modified
+0 -2
toonz/sources/toonzlib/txsheet.cpp
file modified
+4 -3
toonz/sources/toonzlib/txsheetexpr.cpp
file modified
+2 -0
toonz/sources/toonzqt/CMakeLists.txt
file modified
+188 -188
toonz/sources/toonzqt/functionpanel.cpp
file modified
+3 -3
toonz/sources/toonzqt/functionpaneltools.cpp
file modified
+2 -2
toonz/sources/toonzqt/functionselection.cpp
file modified
+2 -2
toonz/sources/toonzqt/functionviewer.cpp
file modified
+2 -2
toonz/sources/toonzqt/infoviewer.cpp
file modified
+1 -2
toonz/sources/toonzqt/keyframenavigator.cpp
file modified
+2 -0
toonz/sources/toonzqt/paramfield.cpp
file modified
+0 -2
toonz/sources/toonzqt/pluginhost.cpp
file modified
+1 -1
toonz/sources/toonzqt/rasterimagedata.cpp
file modified
+2 -0
toonz/sources/toonzqt/schematicviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/styleselection.cpp
file modified
+1 -1
    Merge remote-tracking branch 'origin/master' into revert_room_feature
    
        
file modified
+1 -0
file modified
+16 -8
file modified
+1 -1
file modified
+1 -1
file modified
+2 -2
file modified
+3 -3
file modified
+2 -2
file modified
+158 -158