9a4581 Merge remote-tracking branch 'origin/master' into autopaint_autoapply_undo

Merged and Committed by shun_iwasawa 7 years ago
57 files changed. 275 lines added. 237 lines removed.
toonz/sources/include/tools/cursors.h
file modified
+9 -31
toonz/sources/tnztools/Resources/ex_area.png
file added
+0
toonz/sources/tnztools/Resources/ex_freehand.png
file added
+0
toonz/sources/tnztools/Resources/ex_line.png
file added
+0
toonz/sources/tnztools/Resources/ex_polyline.png
file added
+0
toonz/sources/tnztools/Resources/ex_rectangle.png
file added
+0
toonz/sources/tnztools/Resources/fill.png
file modified
+0 -0
toonz/sources/tnztools/Resources/fill_a.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_f.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_f_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_p.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_p_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_r.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_r_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_a_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_f.png
file removed
-0
toonz/sources/tnztools/Resources/fill_f_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_p.png
file removed
-0
toonz/sources/tnztools/Resources/fill_p_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_r.png
file removed
-0
toonz/sources/tnztools/Resources/fill_r_white.png
file removed
-0
toonz/sources/tnztools/Resources/fill_white.png
file removed
-0
toonz/sources/tnztools/Resources/karasu.png
file modified
+0 -0
toonz/sources/tnztools/Resources/karasu_f.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_f_white.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_p.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_p_white.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_r.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_r_white.png
file removed
-0
toonz/sources/tnztools/Resources/karasu_white.png
file removed
-0
toonz/sources/tnztools/Resources/normaleraser.png
file modified
+0 -0
toonz/sources/tnztools/Resources/picker_style_white.png
file removed
-0
toonz/sources/tnztools/Resources/picker_style_white_area.png
file removed
-0
toonz/sources/tnztools/Resources/picker_style_white_line.png
file removed
-0
toonz/sources/tnztools/Resources/picker_style_white_organize.png
file removed
-0
toonz/sources/tnztools/Resources/recteraser.png
file modified
+0 -0
toonz/sources/tnztools/Resources/recteraser_white.png
file removed
-0
toonz/sources/tnztools/Resources/tape.png
file modified
+0 -0
toonz/sources/tnztools/Resources/tape_white.png
file removed
-0
toonz/sources/tnztools/brushtool.cpp
file modified
+16 -2
toonz/sources/tnztools/brushtool.h
file modified
+1 -0
toonz/sources/tnztools/cursormanager.cpp
file modified
+45 -38
toonz/sources/tnztools/filltool.cpp
file modified
+17 -42
toonz/sources/tnztools/fullcolorbrushtool.cpp
file modified
+34 -8
toonz/sources/tnztools/fullcolorbrushtool.h
file modified
+2 -0
toonz/sources/tnztools/rastererasertool.cpp
file modified
+21 -5
toonz/sources/tnztools/rastertapetool.cpp
file modified
+12 -3
toonz/sources/tnztools/stylepickertool.cpp
file modified
+10 -12
toonz/sources/tnztools/tnztools.qrc
file modified
+6 -29
toonz/sources/tnztools/tooloptions.cpp
file modified
+17 -4
toonz/sources/tnztools/tooloptionscontrols.cpp
file modified
+12 -2
toonz/sources/tnztools/tooloptionscontrols.h
file modified
+1 -1
toonz/sources/tnztools/vectortapetool.cpp
file modified
+4 -3
toonz/sources/toonz/CMakeLists.txt
file modified
+1 -1
toonz/sources/toonz/cellselection.cpp
file modified
+12 -34
toonz/sources/toonz/xshcellviewer.cpp
file modified
+54 -22
toonz/sources/toonzlib/orientation.cpp
file modified
+1 -0
    Merge remote-tracking branch 'origin/master' into autopaint_autoapply_undo
    
        
empty file added
empty file added