2b222e Merge remote-tracking branch 'origin/master' into fix_save_mesh

Merged and Committed by shun_iwasawa 8 years ago
482 files changed. 16330 lines added. 2822 lines removed.
stuff/config/loc/spanish/colorfx.qm
file added
+0
stuff/config/loc/spanish/tnzcore.qm
file added
+0
stuff/config/loc/spanish/tnztools.qm
file added
+0
stuff/config/loc/spanish/toonz.qm
file added
+0
stuff/config/loc/spanish/toonzlib.qm
file added
+0
stuff/config/loc/spanish/toonzqt.qm
file added
+0
thirdparty/lzo/driver/CMakeLists.txt
file modified
+1 -0
toonz/sources/CMakeLists.txt
file modified
+3 -2
toonz/sources/colorfx/colorfxutils.h
file modified
+10 -11
toonz/sources/common/psdlib/psd.h
file modified
+0 -1
toonz/sources/common/tapptools/tcli.cpp
file modified
+11 -15
toonz/sources/common/tapptools/tcolorutils.cpp
file modified
+1 -1
toonz/sources/common/tapptools/tenv.cpp
file modified
+3 -3
toonz/sources/common/tapptools/ttimer.cpp
file modified
+1 -1
toonz/sources/common/tcache/timagecache.cpp
file modified
+9 -9
toonz/sources/common/tcontenthistory.cpp
file modified
+1 -1
toonz/sources/common/tcore/tstopwatch.cpp
file modified
+10 -10
toonz/sources/common/tcore/tstring.cpp
file modified
+5 -5
toonz/sources/common/tfx/trenderer.cpp
file modified
+1 -1
toonz/sources/common/tfx/ttzpimagefx.cpp
file modified
+2 -2
toonz/sources/common/tgl/tgl.cpp
file modified
+3 -6
toonz/sources/common/tiio/bmp/filebmp.c
file modified
+1 -1
toonz/sources/common/tiio/bmp/filebmp.h
file modified
+1 -1
toonz/sources/common/tiio/compatibility/tfile_io.c
file modified
+1 -1
toonz/sources/common/tiio/movsettings.cpp
file modified
+3 -3
toonz/sources/common/tiio/tiio.cpp
file modified
+2 -2
toonz/sources/common/tiio/tiio_bmp.cpp
file modified
+9 -8
toonz/sources/common/tiio/tiio_jpg.cpp
file modified
+1 -1
toonz/sources/common/tiio/tiio_jpg_util.cpp
file modified
+1 -1
toonz/sources/common/timage_io/timage_io.cpp
file modified
+1 -1
toonz/sources/common/tipc/tipc.cpp
file modified
+3 -3
toonz/sources/common/tmsgcore.cpp
file modified
+8 -8
toonz/sources/common/traster/traster.cpp
file modified
+14 -17
toonz/sources/common/trop/brush.cpp
file modified
+5 -8
toonz/sources/common/trop/quickput.cpp
file modified
+6 -6
toonz/sources/common/trop/runsmap.h
file modified
+1 -1
toonz/sources/common/trop/tblur.cpp
file modified
+8 -9
toonz/sources/common/trop/tconvolve.cpp
file modified
+6 -12
toonz/sources/common/trop/toperators.cpp
file modified
+1 -1
toonz/sources/common/trop/tover.cpp
file modified
+3 -3
toonz/sources/common/trop/tresample.cpp
file modified
+55 -118
toonz/sources/common/trop/tropcm.cpp
file modified
+3 -3
toonz/sources/common/tsound/tsound_nt.cpp
file modified
+9 -13
toonz/sources/common/tsystem/cpuextensions.cpp
file modified
+3 -3
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+6 -6
toonz/sources/common/tsystem/tfilepath_io.cpp
file modified
+1 -1
toonz/sources/common/tsystem/tpluginmanager.cpp
file modified
+10 -10
toonz/sources/common/tsystem/tsystem.cpp
file modified
+5 -5
toonz/sources/common/tsystem/tsystempd.cpp
file modified
+18 -19
toonz/sources/common/tsystem/uncpath.cpp
file modified
+3 -3
toonz/sources/common/ttest/ttest.cpp
file modified
+1 -1
toonz/sources/common/tvectorimage/drawutil.cpp
file modified
+1 -1
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+3 -3
toonz/sources/common/tvectorimage/tl2lautocloser.cpp
file modified
+3 -3
toonz/sources/common/tvectorimage/tl2lautocloser.h
file modified
+1 -1
toonz/sources/common/tvectorimage/tsegmentadjuster.h
file modified
+1 -1
toonz/sources/common/tvectorimage/tsweepboundary.cpp
file modified
+2 -2
toonz/sources/common/tvectorimage/tvectorimage.cpp
file modified
+10 -15
toonz/sources/common/tvectorimage/tvectorimageP.h
file modified
+2 -3
toonz/sources/common/tvrender/qtofflinegl.cpp
file modified
+5 -5
toonz/sources/common/tvrender/tfont_nt.cpp
file modified
+6 -9
toonz/sources/common/tvrender/tglregions.cpp
file modified
+1 -1
toonz/sources/common/tvrender/tinbetween.cpp
file modified
+3 -3
toonz/sources/common/tvrender/tofflinegl.cpp
file modified
+3 -3
toonz/sources/common/tvrender/tregionprop.cpp
file modified
+1 -1
toonz/sources/common/tvrender/tsimplecolorstyles.cpp
file modified
+5 -5
toonz/sources/common/tvrender/ttessellator.cpp
file modified
+2 -2
toonz/sources/common/twain/ttwain.h
file modified
+1 -1
toonz/sources/common/twain/ttwainP.h
file modified
+1 -1
toonz/sources/common/twain/ttwain_error.c
file modified
+2 -2
toonz/sources/common/twain/ttwain_global_def.h
file modified
+1 -1
toonz/sources/common/twain/ttwain_state.c
file modified
+3 -3
toonz/sources/common/twain/ttwain_util.c
file modified
+2 -2
toonz/sources/common/twain/twain.h
file modified
+3 -3
toonz/sources/image/avi/tiio_avi.cpp
file modified
+4 -4
toonz/sources/image/avi/tiio_avi.h
file modified
+4 -4
toonz/sources/image/compatibility/inforegion.c
file modified
+4 -4
toonz/sources/image/compatibility/inforegion.h
file modified
+1 -1
toonz/sources/image/compatibility/tfile_io.c
file modified
+1 -1
toonz/sources/image/compatibility/tnz4.h
file modified
+3 -3
toonz/sources/image/compatibility/tnz4_cpp.cpp
file modified
+1 -1
toonz/sources/image/mov/tiio_movW.cpp
file modified
+1 -1
toonz/sources/image/pli/pli_io.cpp
file modified
+76 -63
toonz/sources/image/pli/pli_io.h
file modified
+36 -32
toonz/sources/image/pli/tags.cpp
file modified
+103 -84
toonz/sources/image/pli/tiio_pli.cpp
file modified
+32 -56
toonz/sources/image/pli/tiio_pli.h
file modified
+3 -3
toonz/sources/image/png/tiio_png.cpp
file modified
+47 -42
toonz/sources/image/psd/tiio_psd.cpp
file modified
+1 -1
toonz/sources/image/quantel/filequantel.c
file modified
+1 -1
toonz/sources/image/quantel/filequantelP.h
file modified
+17 -19
toonz/sources/image/sgi/filesgi.cpp
file modified
+60 -67
toonz/sources/image/tif/tiio_tif.cpp
file modified
+10 -14
toonz/sources/image/tiio.cpp
file modified
+5 -5
toonz/sources/image/tzp/avl.c
file modified
+2 -2
toonz/sources/image/tzp/tiio_plt.cpp
file modified
+1 -1
toonz/sources/image/tzp/tiio_tzp.cpp
file modified
+1 -1
toonz/sources/include/ext/Potential.h
file modified
+2 -2
toonz/sources/include/ext/StrokeDeformation.h
file modified
+2 -2
toonz/sources/include/ext/StrokeDeformationImpl.h
file modified
+2 -2
toonz/sources/include/ext/StrokeParametricDeformer.h
file modified
+2 -2
toonz/sources/include/ext/Types.h
file modified
+2 -2
toonz/sources/include/ext/plasticdeformerstorage.h
file modified
+3 -3
toonz/sources/include/ext/plasticskeleton.h
file modified
+1 -1
toonz/sources/include/ext/plasticskeletondeformation.h
file modified
+1 -1
toonz/sources/include/movsettings.h
file modified
+3 -3
toonz/sources/include/t32bitsrv_wrap.h
file modified
+1 -1
toonz/sources/include/tatomicvar.h
file modified
+5 -5
toonz/sources/include/tcachedlevel.h
file modified
+2 -2
toonz/sources/include/tcli.h
file modified
+5 -14
toonz/sources/include/tcolorstyles.h
file modified
+1 -1
toonz/sources/include/tcolumnset.h
file modified
+1 -1
toonz/sources/include/tcommon.h
file modified
+5 -5
toonz/sources/include/tcontenthistory.h
file modified
+0 -1
toonz/sources/include/tconvert.h
file modified
+25 -25
toonz/sources/include/tdata.h
file modified
+3 -3
toonz/sources/include/tdoubleparam.h
file modified
+1 -1
toonz/sources/include/tfarmcontroller.h
file modified
+1 -1
toonz/sources/include/tfarmserver.h
file modified
+1 -1
toonz/sources/include/tfarmtask.h
file modified
+1 -1
toonz/sources/include/tfont.h
file modified
+1 -1
toonz/sources/include/tfx.h
file modified
+1 -1
toonz/sources/include/tgeometry.h
file modified
+4 -4
toonz/sources/include/tgl.h
file modified
+2 -2
toonz/sources/include/timage.h
file modified
+1 -1
toonz/sources/include/timage_io.h
file modified
+2 -2
toonz/sources/include/timagecache.h
file modified
+1 -1
toonz/sources/include/tlevel.h
file modified
+1 -1
toonz/sources/include/tlevel_io.h
file modified
+3 -3
toonz/sources/include/tmacrofx.h
file modified
+1 -1
toonz/sources/include/tmeshimage.h
file modified
+3 -3
toonz/sources/include/tmsgcore.h
file modified
+1 -3
toonz/sources/include/tnotanimatableparam.h
file modified
+7 -7
toonz/sources/include/tnztypes.h
file modified
+1 -1
toonz/sources/include/tools/cursors.h
file modified
+1 -1
toonz/sources/include/tools/toolutils.h
file modified
+0 -2
toonz/sources/include/toonz/Naa2TlvConverter.h
file modified
+2 -3
toonz/sources/include/toonz/imagemanager.h
file modified
+1 -1
toonz/sources/include/toonz/tproject.h
file modified
+1 -1
toonz/sources/include/toonz/tstageobject.h
file modified
+1 -1
toonz/sources/include/toonz/tstageobjectspline.h
file modified
+1 -1
toonz/sources/include/toonz/txshchildlevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshcolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txsheet.h
file modified
+1 -1
toonz/sources/include/toonz/txshlevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshlevelcolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txshmeshcolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txshpalettecolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txshpalettelevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshsimplelevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshsoundcolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txshsoundlevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshsoundtextcolumn.h
file modified
+1 -1
toonz/sources/include/toonz/txshsoundtextlevel.h
file modified
+1 -1
toonz/sources/include/toonz/txshzeraryfxcolumn.h
file modified
+1 -1
toonz/sources/include/toonzqt/camerasettingswidget.h
file modified
+1 -1
toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h
file modified
+1 -1
toonz/sources/include/toonzqt/colorfield.h
file modified
+1 -1
toonz/sources/include/toonzqt/combohistogram.h
file modified
+1 -1
toonz/sources/include/toonzqt/dvdialog.h
file modified
+3 -3
toonz/sources/include/toonzqt/dvtextedit.h
file modified
+1 -1
toonz/sources/include/toonzqt/fxsettings.h
file modified
+2 -4
toonz/sources/include/toonzqt/histogram.h
file modified
+1 -1
toonz/sources/include/toonzqt/paramfield.h
file modified
+1 -1
toonz/sources/include/toonzqt/styleeditor.h
file modified
+4 -6
toonz/sources/include/toonzqt/swatchviewer.h
file modified
+1 -1
toonz/sources/include/toonzqt/tabbar.h
file modified
+1 -1
toonz/sources/include/toonzqt/tmessageviewer.h
file modified
+0 -2
toonz/sources/include/toonzqt/validatedchoicedialog.h
file modified
+1 -1
toonz/sources/include/tpalette.h
file modified
+3 -3
toonz/sources/include/tparam.h
file modified
+2 -2
toonz/sources/include/tparamset.h
file modified
+6 -6
toonz/sources/include/tpixel.h
file modified
+1 -1
toonz/sources/include/tpluginmanager.h
file modified
+1 -1
toonz/sources/include/tproperty.h
file modified
+3 -3
toonz/sources/include/traster.h
file modified
+2 -2
toonz/sources/include/trastercm.h
file modified
+1 -1
toonz/sources/include/trasterfx.h
file modified
+7 -7
toonz/sources/include/trasterimage.h
file modified
+1 -1
toonz/sources/include/tregion.h
file modified
+1 -1
toonz/sources/include/trop_borders.h
file modified
+1 -1
toonz/sources/include/tscanner.h
file modified
+0 -6
toonz/sources/include/tsound.h
file modified
+1 -1
toonz/sources/include/tsound_io.h
file modified
+2 -2
toonz/sources/include/tsound_t.h
file modified
+2 -2
toonz/sources/include/tspectrum.h
file modified
+3 -3
toonz/sources/include/tspectrumparam.h
file modified
+2 -2
toonz/sources/include/tstepparam.h
file modified
+1 -1
toonz/sources/include/tstopwatch.h
file modified
+1 -1
toonz/sources/include/tstrokeoutline.h
file modified
+1 -1
toonz/sources/include/tsystem.h
file modified
+1 -1
toonz/sources/include/ttokenizer.h
file modified
+2 -2
toonz/sources/include/ttonecurveparam.h
file modified
+2 -2
toonz/sources/include/ttoonzimage.h
file modified
+1 -1
toonz/sources/include/tunit.h
file modified
+2 -2
toonz/sources/include/tutil.h
file modified
+1 -1
toonz/sources/include/tvectorgl.h
file modified
+1 -1
toonz/sources/include/tvectorimage.h
file modified
+4 -4
toonz/sources/sound/aiff/tsio_aiff.cpp
file modified
+25 -31
toonz/sources/sound/wav/tsio_wav.cpp
file modified
+18 -24
toonz/sources/stdfx/artcontourfx.cpp
file modified
+1 -4
toonz/sources/stdfx/blendtzfx.cpp
file modified
+1 -4
toonz/sources/stdfx/blurfx.cpp
file modified
+0 -6
toonz/sources/stdfx/bodyhighlightfx.cpp
file modified
+10 -14
toonz/sources/stdfx/calligraphicfx.cpp
file modified
+1 -1
toonz/sources/stdfx/igs_fog.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_add.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_color_burn.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_color_dodge.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_cross_dissolve.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_darken.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_darker_color.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_divide.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_hard_light.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_hard_mix.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_lighten.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_lighter_color.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_linear_burn.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_linear_dodge.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_linear_light.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_multiply.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_over.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_overlay.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_pin_light.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_screen.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_soft_light.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_subtract.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blend_vivid_light.cpp
file modified
+0 -3
toonz/sources/stdfx/ino_blur.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_channel_selector.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_density.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_fog.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hls_add.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hls_adjust.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hls_noise.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hsv_add.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hsv_adjust.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_hsv_noise.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_level_auto.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_level_master.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_level_rgba.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_line_blur.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_maxmin.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_median.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_median_filter.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_motion_blur.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_motion_wind.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_negate.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_pn_clouds.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_radial_blur.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_spin_blur.cpp
file modified
+0 -4
toonz/sources/stdfx/ino_warp_hv.cpp
file modified
+0 -4
toonz/sources/stdfx/iwa_particlesengine.cpp
file modified
+0 -2
toonz/sources/stdfx/localblurfx.cpp
file modified
+16 -31
toonz/sources/stdfx/offscreengl.h
file modified
+3 -3
toonz/sources/stdfx/perlinnoise.cpp
file modified
+1 -1
toonz/sources/stdfx/perlinnoise.h
file modified
+4 -4
toonz/sources/stdfx/pins.cpp
file modified
+2 -2
toonz/sources/stdfx/pins.h
file modified
+1 -1
toonz/sources/stdfx/stdfx.cpp
file modified
+1 -1
toonz/sources/stdfx/stdfx.h
file modified
+1 -1
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+5 -5
toonz/sources/tcomposer/tcomposer.cpp
file modified
+8 -8
toonz/sources/tnzbase/texternfx.cpp
file modified
+2 -2
toonz/sources/tnzbase/tscanner/tscannerepson.cpp
file modified
+29 -42
toonz/sources/tnzbase/tscanner/tscannerepson.h
file modified
+1 -1
toonz/sources/tnzext/NotSimmetricBezierPotential.cpp
file modified
+0 -6
toonz/sources/tnzext/OverallDesigner.cpp
file modified
+0 -6
toonz/sources/tnzext/Potential.cpp
file modified
+2 -2
toonz/sources/tnzext/Selector.cpp
file modified
+0 -6
toonz/sources/tnzext/StrokeDeformationImpl.cpp
file modified
+0 -3
toonz/sources/tnzext/Types.cpp
file modified
+2 -2
toonz/sources/tnzext/meshutils.cpp
file modified
+3 -3
toonz/sources/tnzext/plasticdeformerstorage.cpp
file modified
+13 -14
toonz/sources/tnztools/cuttertool.cpp
file modified
+7 -7
toonz/sources/tnztools/pinchtool.cpp
file modified
+3 -2
toonz/sources/tnztools/tooloptions.cpp
file modified
+2 -2
toonz/sources/tnztools/tooloptionscontrols.h
file modified
+9 -11
toonz/sources/tnztools/vectorerasertool.cpp
file modified
+1 -1
toonz/sources/tnztools/vectorselectiontool.cpp
file modified
+2 -2
toonz/sources/tnztools/vectorselectiontool.h
file modified
+3 -3
toonz/sources/toonz/CMakeLists.txt
file modified
+1 -1
toonz/sources/toonz/ObjectTracker.cpp
file modified
+45 -64
toonz/sources/toonz/ObjectTracker.h
file modified
+4 -4
toonz/sources/toonz/addfilmstripframespopup.cpp
file modified
+3 -3
toonz/sources/toonz/addfilmstripframespopup.h
file modified
+2 -4
toonz/sources/toonz/batches.cpp
file modified
+8 -8
toonz/sources/toonz/batches.h
file modified
+2 -2
toonz/sources/toonz/batchserversviewer.cpp
file modified
+13 -16
toonz/sources/toonz/batchserversviewer.h
file modified
+12 -12
toonz/sources/toonz/castselection.cpp
file modified
+5 -6
toonz/sources/toonz/castviewer.cpp
file modified
+6 -3
toonz/sources/toonz/castviewer.h
file modified
+4 -4
toonz/sources/toonz/cellkeyframeselection.cpp
file modified
+3 -1
toonz/sources/toonz/cellselectioncommand.cpp
file modified
+4 -6
toonz/sources/toonz/cleanuppaletteviewer.cpp
file modified
+1 -1
toonz/sources/toonz/cleanuppaletteviewer.h
file modified
+1 -3
toonz/sources/toonz/cleanuppopup.cpp
file modified
+12 -12
toonz/sources/toonz/cleanupsettingsmodel.cpp
file modified
+3 -3
toonz/sources/toonz/cleanupsettingspane.cpp
file modified
+1 -1
toonz/sources/toonz/cleanupsettingspopup.cpp
file modified
+22 -22
toonz/sources/toonz/colormodelviewer.cpp
file modified
+2 -2
toonz/sources/toonz/comboviewerpane.h
file modified
+0 -2
toonz/sources/toonz/convertpopup.cpp
file modified
+31 -31
toonz/sources/toonz/curveio.cpp
file modified
+3 -3
toonz/sources/toonz/drawingdata.cpp
file modified
+1 -1
toonz/sources/toonz/duplicatepopup.cpp
file modified
+3 -3
toonz/sources/toonz/duplicatepopup.h
file modified
+1 -3
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+7 -7
toonz/sources/toonz/exportlevelcommand.cpp
file modified
+2 -2
toonz/sources/toonz/exportlevelpopup.cpp
file modified
+7 -7
toonz/sources/toonz/exportpanel.cpp
file modified
+4 -4
toonz/sources/toonz/exportscenepopup.cpp
file modified
+8 -8
toonz/sources/toonz/exportscenepopup.h
file modified
+1 -3
toonz/sources/toonz/filebrowser.cpp
file modified
+21 -21
toonz/sources/toonz/filebrowser.h
file modified
+2 -4
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+4 -4
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+26 -26
toonz/sources/toonz/filebrowserpopup.h
file modified
+9 -9
toonz/sources/toonz/filebrowserversioncontrol.cpp
file modified
+2 -2
toonz/sources/toonz/filedata.cpp
file modified
+2 -2
toonz/sources/toonz/fileinfopopup.h
file modified
+1 -3
toonz/sources/toonz/fileselection.cpp
file modified
+14 -14
toonz/sources/toonz/filmstrip.h
file modified
+1 -3
toonz/sources/toonz/filmstripselection.cpp
file modified
+1 -1
toonz/sources/toonz/flipbook.cpp
file modified
+23 -23
toonz/sources/toonz/flipbook.h
file modified
+4 -4
toonz/sources/toonz/formatsettingspopups.cpp
file modified
+11 -11
toonz/sources/toonz/formatsettingspopups.h
file modified
+4 -4
toonz/sources/toonz/fxparameditorpopup.h
file modified
+0 -2
toonz/sources/toonz/histogrampopup.h
file modified
+0 -2
toonz/sources/toonz/imageviewer.cpp
file modified
+1 -1
toonz/sources/toonz/insertfxpopup.cpp
file modified
+1 -1
toonz/sources/toonz/insertfxpopup.h
file modified
+1 -4
toonz/sources/toonz/iocommand.cpp
file modified
+33 -33
toonz/sources/toonz/levelcreatepopup.cpp
file modified
+5 -5
toonz/sources/toonz/levelcreatepopup.h
file modified
+8 -10
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+6 -6
toonz/sources/toonz/linesfadepopup.h
file modified
+0 -2
toonz/sources/toonz/linetestcapturepane.cpp
file modified
+9 -9
toonz/sources/toonz/linetestpane.h
file modified
+0 -2
toonz/sources/toonz/loadfoldercommand.cpp
file modified
+1 -2
toonz/sources/toonz/magpiefileimportpopup.cpp
file modified
+4 -4
toonz/sources/toonz/magpiefileimportpopup.h
file modified
+5 -7
toonz/sources/toonz/main.cpp
file modified
+10 -10
toonz/sources/toonz/mainwindow.cpp
file modified
+6 -7
toonz/sources/toonz/matchline.cpp
file modified
+18 -18
toonz/sources/toonz/matchline.h
file modified
+7 -7
toonz/sources/toonz/matchlinecommand.cpp
file modified
+17 -17
toonz/sources/toonz/menubar.cpp
file modified
+2 -2
toonz/sources/toonz/menubarpopup.h
file modified
+1 -1
toonz/sources/toonz/mergecmapped.cpp
file modified
+10 -10
toonz/sources/toonz/mergecolumns.cpp
file modified
+12 -12
toonz/sources/toonz/meshifypopup.cpp
file modified
+6 -6
toonz/sources/toonz/outputsettingspopup.cpp
file modified
+17 -17
toonz/sources/toonz/overwritepopup.cpp
file modified
+4 -4
toonz/sources/toonz/overwritepopup.h
file modified
+2 -2
toonz/sources/toonz/pltgizmopopup.h
file modified
+5 -7
toonz/sources/toonz/predict3d.cpp
file modified
+4 -9
toonz/sources/toonz/preferencespopup.cpp
file modified
+8 -8
toonz/sources/toonz/previewer.cpp
file modified
+6 -6
toonz/sources/toonz/projectpopup.cpp
file modified
+4 -4
toonz/sources/toonz/rendercommand.cpp
file modified
+17 -17
toonz/sources/toonz/renumberpopup.cpp
file modified
+2 -2
toonz/sources/toonz/renumberpopup.h
file modified
+2 -4
toonz/sources/toonz/savepresetpopup.cpp
file modified
+3 -3
toonz/sources/toonz/savepresetpopup.h
file modified
+2 -4
toonz/sources/toonz/scanpopup.cpp
file modified
+16 -16
toonz/sources/toonz/scenesettingspopup.cpp
file modified
+5 -5
toonz/sources/toonz/scenesettingspopup.h
file modified
+8 -10
toonz/sources/toonz/sceneviewer.cpp
file modified
+2 -2
toonz/sources/toonz/sceneviewerevents.cpp
file modified
+4 -4
toonz/sources/toonz/shortcutpopup.cpp
file modified
+1 -1
toonz/sources/toonz/shortcutpopup.h
file modified
+1 -3
toonz/sources/toonz/subscenecommand.cpp
file modified
+3 -3
toonz/sources/toonz/svncleanupdialog.h
file modified
+1 -5
toonz/sources/toonz/svncommitdialog.h
file modified
+2 -4
toonz/sources/toonz/svndeletedialog.h
file modified
+1 -3
toonz/sources/toonz/svnlockdialog.h
file modified
+2 -4
toonz/sources/toonz/svnlockframerangedialog.cpp
file modified
+4 -4
toonz/sources/toonz/svnlockframerangedialog.h
file modified
+10 -12
toonz/sources/toonz/svnpurgedialog.h
file modified
+1 -5
toonz/sources/toonz/svnrevertdialog.h
file modified
+2 -4
toonz/sources/toonz/svnupdateandlockdialog.h
file modified
+1 -3
toonz/sources/toonz/svnupdatedialog.h
file modified
+1 -3
toonz/sources/toonz/tapp.cpp
file modified
+2 -2
toonz/sources/toonz/tasksviewer.cpp
file modified
+2 -2
toonz/sources/toonz/timestretchpopup.cpp
file modified
+5 -7
toonz/sources/toonz/timestretchpopup.h
file modified
+2 -4
toonz/sources/toonz/tpanels.cpp
file modified
+4 -4
toonz/sources/toonz/trackerpopup.cpp
file modified
+7 -12
toonz/sources/toonz/versioncontrol.cpp
file modified
+6 -6
toonz/sources/toonz/viewerpane.h
file modified
+0 -2
toonz/sources/toonz/xshcellviewer.cpp
file modified
+2 -2
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+3 -3
toonz/sources/toonz/xsheetcmd.cpp
file modified
+1 -1
toonz/sources/toonz/xsheetviewer.h
file modified
+1 -1
toonz/sources/toonz/xshnoteviewer.cpp
file modified
+18 -9
toonz/sources/toonz/xshnoteviewer.h
file modified
+4 -12
toonz/sources/toonz/xshrowviewer.cpp
file modified
+1 -1
toonz/sources/toonzfarm/include/service.h
file modified
+11 -12
toonz/sources/toonzfarm/include/tfarmexecutor.h
file modified
+1 -1
toonz/sources/toonzfarm/include/tfarmproxy.h
file modified
+1 -1
toonz/sources/toonzfarm/include/tlog.h
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/service.cpp
file modified
+28 -28
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/tlog.cpp
file modified
+3 -3
toonz/sources/toonzfarm/tfarm/ttcpipclient.cpp
file modified
+15 -15
toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp
file modified
+17 -17
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+13 -13
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+20 -20
toonz/sources/toonzlib/cleanupparameters.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/BlurMatrix.cpp
file modified
+6 -4
toonz/sources/toonzlib/sandor_fxs/BlurMatrix.h
file modified
+4 -6
toonz/sources/toonzlib/sandor_fxs/CIL.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/CallCircle.cpp
file modified
+4 -7
toonz/sources/toonzlib/sandor_fxs/CallCircle.h
file modified
+9 -11
toonz/sources/toonzlib/sandor_fxs/EraseContour.cpp
file modified
+8 -8
toonz/sources/toonzlib/sandor_fxs/EraseContour.h
file modified
+14 -4
toonz/sources/toonzlib/sandor_fxs/InputParam.h
file modified
+2 -4
toonz/sources/toonzlib/sandor_fxs/Params.h
file modified
+2 -4
toonz/sources/toonzlib/sandor_fxs/Pattern.cpp
file modified
+16 -21
toonz/sources/toonzlib/sandor_fxs/Pattern.h
file modified
+5 -4
toonz/sources/toonzlib/sandor_fxs/PatternMapParam.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/PatternPosition.cpp
file modified
+8 -11
toonz/sources/toonzlib/sandor_fxs/PatternPosition.h
file modified
+2 -4
toonz/sources/toonzlib/sandor_fxs/SDirection.cpp
file modified
+30 -38
toonz/sources/toonzlib/sandor_fxs/SDirection.h
file modified
+4 -4
toonz/sources/toonzlib/sandor_fxs/SError.h
file modified
+1 -3
toonz/sources/toonzlib/sandor_fxs/STColSelPic.h
file modified
+22 -41
toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp
file modified
+9 -7
toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp
file modified
+2 -2
toonz/sources/toonzlib/sandor_fxs/YOMBParam.h
file modified
+2 -4
toonz/sources/toonzlib/sandor_fxs/blend.cpp
file modified
+6 -9
toonz/sources/toonzlib/sandor_fxs/calligraph.cpp
file modified
+5 -5
toonz/sources/toonzlib/sandor_fxs/patternmap.cpp
file modified
+7 -7
toonz/sources/toonzlib/sandor_fxs/toonz4_6staff.cpp
file modified
+1 -1
toonz/sources/toonzlib/screensavermaker.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcenterlinepolygonizer.cpp
file modified
+34 -42
toonz/sources/toonzlib/tcleanupper.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+1 -1
toonz/sources/toonzlib/tdistort.cpp
file modified
+38 -45
toonz/sources/toonzlib/texturemanager.cpp
file modified
+1 -1
toonz/sources/toonzlib/tlog.cpp
file modified
+5 -5
toonz/sources/toonzlib/toutlinevectorizer.cpp
file modified
+2 -1
toonz/sources/toonzlib/tstageobject.cpp
file modified
+2 -2
toonz/sources/toonzlib/txsheet.cpp
file modified
+8 -30
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+4 -4
toonz/sources/toonzqt/camerasettingswidget.cpp
file modified
+3 -3
toonz/sources/toonzqt/colorfield.cpp
file modified
+1 -1
toonz/sources/toonzqt/dvdialog.cpp
file modified
+15 -15
toonz/sources/toonzqt/flipconsole.cpp
file modified
+3 -3
toonz/sources/toonzqt/framenavigator.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionpanel.cpp
file modified
+2 -0
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+4 -4
toonz/sources/toonzqt/functionselection.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionsheet.cpp
file modified
+2 -2
toonz/sources/toonzqt/gutil.cpp
file modified
+1 -1
toonz/sources/toonzqt/imageutils.cpp
file modified
+18 -19
toonz/sources/toonzqt/infoviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/intfield.cpp
file modified
+1 -1
toonz/sources/toonzqt/intpairfield.cpp
file modified
+2 -2
toonz/sources/toonzqt/keyframenavigator.cpp
file modified
+1 -1
toonz/sources/toonzqt/lineedit.cpp
file modified
+1 -1
toonz/sources/toonzqt/menubarcommand.cpp
file modified
+1 -1
toonz/sources/toonzqt/palettesscanpopup.cpp
file modified
+1 -1
toonz/sources/toonzqt/palettesscanpopup.h
file modified
+2 -4
toonz/sources/toonzqt/paletteviewer.cpp
file modified
+4 -4
toonz/sources/toonzqt/pluginhost.cpp
file modified
+2 -6
toonz/sources/toonzqt/pluginhost.h
file modified
+2 -2
toonz/sources/toonzqt/spreadsheetviewer.cpp
file modified
+1 -1
toonz/sources/toonzqt/stageschematicscene.cpp
file modified
+3 -3
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+6 -6
toonz/sources/toonzqt/styleeditor.cpp
file modified
+3 -3
toonz/sources/toonzqt/styleselection.cpp
file modified
+1 -1
toonz/sources/toonzqt/tmessageviewer.cpp
file modified
+5 -5
toonz/sources/translations/spanish/colorfx.ts
file added
+723
toonz/sources/translations/spanish/tnzcore.ts
file added
+48
toonz/sources/translations/spanish/tnztools.ts
file added
+1001
toonz/sources/translations/spanish/toonz.ts
file added
+9194
toonz/sources/translations/spanish/toonzlib.ts
file added
+888
toonz/sources/translations/spanish/toonzqt.ts
file added
+2201
    Merge remote-tracking branch 'origin/master' into fix_save_mesh
    
        
empty file added
empty file added
empty file added
empty file added
empty file added
empty file added
file modified
+3 -2
file modified
+103 -84
file modified
+5 -5
file modified
+5 -14
file modified
+1 -1
file modified
+2 -2
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+10 -10
file modified
+2 -2