bw / opentoonz

Clone
Source Code
GIT

ec9197 Merged in OT master with conflicts resolved

Merged and Committed by manongjohn 6 years ago
raw patch tree
ad26eb8b992b9c89b4aa06fc5fe994f8af6f0372 e4aac6f4338a4f40d9526d32cc32c0b184f6c141
35 files changed. 955 lines added. 136 lines removed.
toonz/sources/common/tfx/tmacrofx.cpp
file modified
+3 -1
toonz/sources/common/tiio/tiio_jpg_exif.cpp
file modified
+5 -5
toonz/sources/common/tvrender/tglregions.cpp
file modified
+11 -10
toonz/sources/common/twain/ttwain_stateX.c
file modified
+2 -0
toonz/sources/include/tools/tooloptions.h
file modified
+15 -0
toonz/sources/include/toonz/fill.h
file modified
+3 -0
toonz/sources/include/toonz/ttileset.h
file modified
+1 -0
toonz/sources/include/toonzqt/fxschematicnode.h
file modified
+7 -0
toonz/sources/include/toonzqt/fxsettings.h
file modified
+2 -0
toonz/sources/tnztools/CMakeLists.txt
file modified
+2 -0
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+3 -0
toonz/sources/tnztools/fullcolorfilltool.cpp
file added
+223
toonz/sources/tnztools/fullcolorfilltool.h
file added
+45
toonz/sources/tnztools/tooloptions.cpp
file modified
+39 -4
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+12 -4
toonz/sources/tnztools/tooloptionscontrols.h
file modified
+4 -2
toonz/sources/toonz/filmstripcommand.cpp
file modified
+28 -29
toonz/sources/toonz/fxparameditorpopup.cpp
file modified
+2 -1
toonz/sources/toonz/iocommand.cpp
file modified
+28 -21
toonz/sources/toonz/mainwindow.cpp
file modified
+4 -0
toonz/sources/toonz/sceneviewer.cpp
file modified
+24 -4
toonz/sources/toonz/startuppopup.cpp
file modified
+15 -5
toonz/sources/toonz/tasksviewer.cpp
file modified
+1 -1
toonz/sources/toonz/tpanels.cpp
file modified
+50 -0
toonz/sources/toonz/tpanels.h
file modified
+15 -0
toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
file modified
+5 -5
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
file modified
+5 -5
toonz/sources/toonzlib/cellpositionratio.cpp
file modified
+4 -2
toonz/sources/toonzlib/fill.cpp
file modified
+217 -3
toonz/sources/toonzlib/stylemanager.cpp
file modified
+48 -10
toonz/sources/toonzlib/ttileset.cpp
file modified
+10 -0
toonz/sources/toonzqt/fxschematicnode.cpp
file modified
+88 -9
toonz/sources/toonzqt/fxschematicscene.cpp
file modified
+2 -0
toonz/sources/toonzqt/fxsettings.cpp
file modified
+30 -14
toonz/sources/toonzqt/styleeditor.cpp
file modified
+2 -1 
    Merged in OT master with conflicts resolved
file modified
+3 -1
file modified
+5 -5
file modified
+11 -10
file modified
+2 -0
file modified
+15 -0
file modified
+3 -0
file modified
+1 -0
file modified
+7 -0
file modified
+2 -0
file modified
+2 -0
file modified
+3 -0
file added
+223
file added
+45
file modified
+39 -4
file modified
+12 -4
file modified
+4 -2
file modified
+28 -29
file modified
+2 -1
file modified
+28 -21
file modified
+4 -0
file modified
+24 -4
file modified
+15 -5
file modified
+1 -1
file modified
+50 -0
file modified
+15 -0
file modified
+5 -5
file modified
+5 -5
file modified
+4 -2
file modified
+217 -3
file modified
+48 -10
file modified
+10 -0
file modified
+88 -9
file modified
+2 -0
file modified
+30 -14
file modified
+2 -1

Powered by Pagure 5.11.3

SSH Hostkey/Fingerprint | Documentation | About

© 2014-2019 Red Hat, Inc. and others.

Logo by Pavel Lashutin