54ae32 Merge branch 'master' of https://github.com/opentoonz/opentoonz

Merged and Committed by walkerka 8 years ago
210 files changed. 999 lines added. 2147 lines removed.
stuff/config/loc/日本語/toonz.qm
file modified
+0 -0
stuff/config/loc/日本語/toonzlib.qm
file modified
+0 -0
stuff/config/loc/日本語/toonzqt.qm
file modified
+0 -0
stuff/profiles/layouts/rooms/Default/layouts.txt
file modified
+2 -2
stuff/projects/reslist.txt
file modified
+2 -0
toonz/sources/colorfx/strokestyles.cpp
file modified
+2 -2
toonz/sources/common/tapptools/tcli.cpp
file modified
+1 -1
toonz/sources/common/tapptools/tenv.cpp
file modified
+8 -16
toonz/sources/common/tcache/timagecache.cpp
file modified
+17 -17
toonz/sources/common/tcore/tdata.cpp
file modified
+1 -1
toonz/sources/common/tcore/texception.cpp
file modified
+1 -1
toonz/sources/common/tcore/tmathutil.cpp
file modified
+1 -1
toonz/sources/common/tcore/tstopwatch.cpp
file modified
+2 -0
toonz/sources/common/tcore/tstring.cpp
file modified
+25 -93
toonz/sources/common/tfx/tcacheresource.cpp
file modified
+2 -2
toonz/sources/common/tfx/tmacrofx.cpp
file modified
+5 -5
toonz/sources/common/tfx/tpassivecachemanager.cpp
file modified
+1 -33
toonz/sources/common/tfx/ttzpimagefx.cpp
file modified
+33 -33
toonz/sources/common/tfx/unaryFx.cpp
file modified
+6 -6
toonz/sources/common/tgl/tgl.cpp
file modified
+1 -1
toonz/sources/common/tiio/movsettings.cpp
file modified
+4 -4
toonz/sources/common/tiio/tiio_bmp.cpp
file modified
+1 -1
toonz/sources/common/timage_io/timage_io.cpp
file modified
+1 -1
toonz/sources/common/tparam/tdoublekeyframe.cpp
file modified
+1 -1
toonz/sources/common/tparam/tdoubleparam.cpp
file modified
+3 -3
toonz/sources/common/tparam/tdoubleparamfile.cpp
file modified
+1 -1
toonz/sources/common/tparam/tdoubleparamrelayproperty.cpp
file modified
+1 -1
toonz/sources/common/tparam/tspectrumparam.cpp
file modified
+7 -7
toonz/sources/common/tproperty.cpp
file modified
+29 -29
toonz/sources/common/trop/trop.cpp
file modified
+1 -1
toonz/sources/common/tsound/tsound.cpp
file modified
+2 -2
toonz/sources/common/tstream/tstream.cpp
file modified
+13 -40
toonz/sources/common/tstream/tstreamexception.cpp
file modified
+2 -2
toonz/sources/common/tsystem/tbigmemorymanager.cpp
file modified
+4 -4
toonz/sources/common/tsystem/tfilepath.cpp
file modified
+20 -21
toonz/sources/common/tsystem/tfilepath_io.cpp
file modified
+1 -1
toonz/sources/common/tsystem/tlogger.cpp
file modified
+3 -3
toonz/sources/common/tsystem/tpluginmanager.cpp
file modified
+2 -3
toonz/sources/common/tsystem/tsystem.cpp
file modified
+3 -3
toonz/sources/common/tsystem/tsystempd.cpp
file modified
+8 -11
toonz/sources/common/tsystem/uncpath.cpp
file modified
+8 -8
toonz/sources/common/ttest/ttest.cpp
file modified
+2 -1
toonz/sources/common/tunit/tunit.cpp
file modified
+8 -8
toonz/sources/common/tvectorimage/tcomputeregions.cpp
file modified
+0 -13
toonz/sources/common/tvrender/tcolorstyles.cpp
file modified
+11 -11
toonz/sources/common/tvrender/tpalette.cpp
file modified
+3 -3
toonz/sources/common/tvrender/tsimplecolorstyles.cpp
file modified
+2 -1
toonz/sources/image/3gp/tiio_3gpM.cpp
file modified
+5 -7
toonz/sources/image/3gp/tiio_3gpW.cpp
file modified
+3 -1
toonz/sources/image/avi/tiio_avi.cpp
file modified
+15 -15
toonz/sources/image/mov/tiio_movM.cpp
file modified
+1 -15
toonz/sources/image/mov/tiio_movW.cpp
file modified
+1 -1
toonz/sources/image/pli/tiio_pli.cpp
file modified
+5 -5
toonz/sources/image/sgi/filesgi.cpp
file modified
+2 -2
toonz/sources/image/tif/tiio_tif.cpp
file modified
+1 -2
toonz/sources/include/convert2tlv.h
file modified
+2 -1
toonz/sources/include/tcli.h
file modified
+2 -2
toonz/sources/include/tcommon.h
file modified
+0 -1
toonz/sources/include/tconvert.h
file modified
+7 -18
toonz/sources/include/tnotanimatableparam.h
file modified
+2 -1
toonz/sources/include/toonz/palettecmd.h
file modified
+8 -1
toonz/sources/include/toonz/tcamera.h
file modified
+2 -1
toonz/sources/include/tproperty.h
file modified
+10 -8
toonz/sources/stdfx/artcontourfx.cpp
file modified
+2 -2
toonz/sources/stdfx/blendtzfx.cpp
file modified
+2 -2
toonz/sources/stdfx/calligraphicfx.cpp
file modified
+8 -8
toonz/sources/stdfx/cornerpinfx.cpp
file modified
+2 -2
toonz/sources/stdfx/externalpalettefx.cpp
file modified
+3 -3
toonz/sources/stdfx/iwa_motionblurfx.cpp
file modified
+1 -1
toonz/sources/stdfx/iwa_particlesengine.cpp
file modified
+2 -0
toonz/sources/stdfx/iwa_particlesfx.cpp
file modified
+1 -1
toonz/sources/stdfx/motionblurfx.cpp
file modified
+1 -1
toonz/sources/stdfx/noisefx.cpp
file modified
+1 -1
toonz/sources/stdfx/palettefilterfx.cpp
file modified
+2 -2
toonz/sources/stdfx/particlesengine.cpp
file modified
+2 -0
toonz/sources/stdfx/particlesfx.cpp
file modified
+1 -1
toonz/sources/stdfx/saltpeppernoisefx.cpp
file modified
+1 -1
toonz/sources/stdfx/texturefx.cpp
file modified
+2 -2
toonz/sources/tcleanupper/tcleanupper.cpp
file modified
+5 -5
toonz/sources/tcomposer/tcomposer.cpp
file modified
+28 -36
toonz/sources/tconverter/tconverter.cpp
file modified
+5 -5
toonz/sources/tnzbase/stringtable.cpp
file modified
+4 -4
toonz/sources/tnzbase/texternfx.cpp
file modified
+3 -3
toonz/sources/tnzbase/trasterfx.cpp
file modified
+25 -25
toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO_M.cpp
file modified
+1 -0
toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO_W.cpp
file modified
+2 -0
toonz/sources/tnzbase/tscanner/tscanner.cpp
file modified
+10 -10
toonz/sources/tnzbase/tscanner/tscannerepson.cpp
file modified
+11 -8
toonz/sources/tnztools/filltool.cpp
file modified
+8 -8
toonz/sources/tnztools/fullcolorerasertool.cpp
file modified
+2 -2
toonz/sources/tnztools/geometrictool.cpp
file modified
+6 -6
toonz/sources/tnztools/hooktool.cpp
file modified
+3 -3
toonz/sources/tnztools/paintbrushtool.cpp
file modified
+3 -3
toonz/sources/tnztools/rastererasertool.cpp
file modified
+4 -4
toonz/sources/tnztools/rasterselection.cpp
file modified
+5 -5
toonz/sources/tnztools/rasterselectiontool.cpp
file modified
+2 -2
toonz/sources/tnztools/rastertapetool.cpp
file modified
+4 -4
toonz/sources/tnztools/rgbpickertool.cpp
file modified
+2 -2
toonz/sources/tnztools/selectiontool.cpp
file modified
+2 -2
toonz/sources/tnztools/skeletontool.cpp
file modified
+3 -3
toonz/sources/tnztools/tooloptions.cpp
file modified
+2 -2
toonz/sources/tnztools/toolutils.cpp
file modified
+1 -1
toonz/sources/tnztools/trackertool.cpp
file modified
+1 -1
toonz/sources/tnztools/typetool.cpp
file modified
+3 -3
toonz/sources/tnztools/vectorerasertool.cpp
file modified
+2 -2
toonz/sources/tnztools/vectortapetool.cpp
file modified
+4 -4
toonz/sources/toonz/CMakeLists.txt
file modified
+2 -6
toonz/sources/toonz/batchserversviewer.cpp
file modified
+7 -7
toonz/sources/toonz/cachefxcommand.cpp
file modified
+1 -1
toonz/sources/toonz/canvassizepopup.cpp
file modified
+2 -2
toonz/sources/toonz/colormodelviewer.cpp
file modified
+25 -5
toonz/sources/toonz/comboviewerpane.cpp
file modified
+1 -1
toonz/sources/toonz/convertpopup.cpp
file modified
+16 -8
toonz/sources/toonz/convertpopup.h
file modified
+2 -1
toonz/sources/toonz/curveio.cpp
file modified
+1 -1
toonz/sources/toonz/dvdirtreeview.cpp
file modified
+1 -1
toonz/sources/toonz/filebrowser.cpp
file modified
+3 -3
toonz/sources/toonz/filebrowsermodel.cpp
file modified
+6 -6
toonz/sources/toonz/filebrowserpopup.cpp
file modified
+26 -8
toonz/sources/toonz/filedata.cpp
file modified
+1 -1
toonz/sources/toonz/flipbook.cpp
file modified
+10 -11
toonz/sources/toonz/formatsettingspopups.cpp
file modified
+1 -1
toonz/sources/toonz/insertfxpopup.cpp
file modified
+2 -2
toonz/sources/toonz/iocommand.cpp
file modified
+4 -72
toonz/sources/toonz/iocommand.h
file modified
+0 -2
toonz/sources/toonz/levelsettingspopup.cpp
file modified
+4 -4
toonz/sources/toonz/main.cpp
file modified
+1 -1
toonz/sources/toonz/mainwindow.cpp
file modified
+3 -3
toonz/sources/toonz/palettecmd.cpp
file removed
-665
toonz/sources/toonz/palettecmd.h
file removed
-48
toonz/sources/toonz/previewer.cpp
file modified
+19 -19
toonz/sources/toonz/previewfxmanager.cpp
file modified
+7 -7
toonz/sources/toonz/projectpopup.cpp
file modified
+5 -2
toonz/sources/toonz/psdsettingspopup.cpp
file modified
+7 -7
toonz/sources/toonz/rendercommand.cpp
file modified
+6 -6
toonz/sources/toonz/scanlist.cpp
file modified
+1 -1
toonz/sources/toonz/sceneviewer.cpp
file modified
+5 -0
toonz/sources/toonz/sceneviewer.h
file modified
+1 -1
toonz/sources/toonz/subscenecommand.cpp
file modified
+4 -4
toonz/sources/toonz/tasksviewer.cpp
file modified
+2 -2
toonz/sources/toonz/tfarmstuff.cpp
file modified
+1 -1
toonz/sources/toonz/vectorizerpopup.cpp
file modified
+1 -1
toonz/sources/toonz/viewer.cpp
file removed
-83
toonz/sources/toonz/viewer.h
file removed
-46
toonz/sources/toonz/viewerdraw.cpp
file modified
+1 -1
toonz/sources/toonz/viewerpane.cpp
file modified
+1 -1
toonz/sources/toonz/writer.cpp
file removed
-60
toonz/sources/toonz/writer.h
file removed
-47
toonz/sources/toonz/xshcellviewer.cpp
file modified
+6 -6
toonz/sources/toonz/xshcolumnviewer.cpp
file modified
+5 -5
toonz/sources/toonz/xsheetcmd.cpp
file modified
+8 -8
toonz/sources/toonz/xsheetviewer.cpp
file modified
+1 -1
toonz/sources/toonz/xshrowviewer.cpp
file modified
+2 -2
toonz/sources/toonzfarm/tfarm/service.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp
file modified
+2 -0
toonz/sources/toonzfarm/tfarm/tfarmproxy.cpp
file modified
+2 -2
toonz/sources/toonzfarm/tfarm/ttcpipclient.cpp
file modified
+1 -1
toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp
file modified
+2 -2
toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp
file modified
+3 -2
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+8 -7
toonz/sources/toonzlib/autopos.cpp
file modified
+2 -0
toonz/sources/toonzlib/avicodecrestrictions.cpp
file modified
+3 -3
toonz/sources/toonzlib/cleanupparameters.cpp
file modified
+21 -31
toonz/sources/toonzlib/convert2tlv.cpp
file modified
+15 -12
toonz/sources/toonzlib/fxcommand.cpp
file modified
+1 -1
toonz/sources/toonzlib/hook.cpp
file modified
+1 -1
toonz/sources/toonzlib/levelset.cpp
file modified
+2 -2
toonz/sources/toonzlib/levelupdater.cpp
file modified
+3 -3
toonz/sources/toonzlib/movierenderer.cpp
file modified
+2 -2
toonz/sources/toonzlib/multimediarenderer.cpp
file modified
+0 -1
toonz/sources/toonzlib/namebuilder.cpp
file modified
+2 -2
toonz/sources/toonzlib/palettecmd.cpp
file modified
+17 -11
toonz/sources/toonzlib/plasticdeformerfx.cpp
file modified
+9 -9
toonz/sources/toonzlib/preferences.cpp
file modified
+1 -1
toonz/sources/toonzlib/sandor_fxs/toonz4_6staff.cpp
file modified
+1 -1
toonz/sources/toonzlib/sceneresources.cpp
file modified
+1 -1
toonz/sources/toonzlib/scriptbinding_files.cpp
file modified
+1 -7
toonz/sources/toonzlib/scriptbinding_level.cpp
file modified
+1 -1
toonz/sources/toonzlib/stage.cpp
file modified
+0 -22
toonz/sources/toonzlib/studiopalette.cpp
file modified
+10 -10
toonz/sources/toonzlib/studiopalettecmd.cpp
file modified
+1 -1
toonz/sources/toonzlib/tcamera.cpp
file modified
+2 -1
toonz/sources/toonzlib/tcolumnfx.cpp
file modified
+20 -20
toonz/sources/toonzlib/texturemanager.cpp
file modified
+3 -2
toonz/sources/toonzlib/textureutils.cpp
file modified
+1 -1
toonz/sources/toonzlib/toonzimageutils.cpp
file modified
+3 -3
toonz/sources/toonzlib/toonzscene.cpp
file modified
+8 -8
toonz/sources/toonzlib/tproject.cpp
file modified
+4 -4
toonz/sources/toonzlib/trasterimageutils.cpp
file modified
+1 -1
toonz/sources/toonzlib/tstageobject.cpp
file modified
+9 -10
toonz/sources/toonzlib/tstageobjectcmd.cpp
file modified
+2 -2
toonz/sources/toonzlib/tstageobjectspline.cpp
file modified
+2 -2
toonz/sources/toonzlib/txshchildlevel.cpp
file modified
+0 -2
toonz/sources/toonzlib/txsheet.cpp
file modified
+2 -2
toonz/sources/toonzlib/txsheetexpr.cpp
file modified
+2 -2
toonz/sources/toonzlib/txshsimplelevel.cpp
file modified
+26 -25
toonz/sources/toonzqt/addfxcontextmenu.cpp
file modified
+0 -22
toonz/sources/toonzqt/colorfield.cpp
file modified
+1 -1
toonz/sources/toonzqt/functionsegmentviewer.cpp
file modified
+3 -3
toonz/sources/toonzqt/fxhistogramrender.cpp
file modified
+4 -4
toonz/sources/toonzqt/fxsettings.cpp
file modified
+1 -3
toonz/sources/toonzqt/icongenerator.cpp
file modified
+2 -2
toonz/sources/toonzqt/imageutils.cpp
file modified
+2 -4
toonz/sources/toonzqt/stageschematicnode.cpp
file modified
+2 -2
toonz/sources/toonzqt/studiopaletteviewer.cpp
file modified
+11 -11
toonz/sources/toonzqt/styleeditor.cpp
file modified
+2 -2
toonz/sources/toonzqt/styleselection.cpp
file modified
+2 -2
toonz/sources/translations/japanese/toonz.ts
file modified
+62 -35
toonz/sources/translations/japanese/toonzlib.ts
file modified
+4 -0
toonz/sources/translations/japanese/toonzqt.ts
file modified
+4 -4
    Merge branch 'master' of https://github.com/opentoonz/opentoonz
    
        
file modified
+2 -0
file modified
+2 -2
file modified
+1 -1