de88b7 Merge branch 'master' into icons-refine

24 files Merged by konero 3 years ago , Committed by GitHub 3 years ago ,
24 files changed. 1882 lines added. 140 lines removed.
doc/how_to_build_macosx.md
file modified
+2 -2
stuff/config/current.txt
file modified
+20 -1
stuff/profiles/layouts/fxs/STD_iwa_FloorBumpFx.xml
file added
+39
stuff/profiles/layouts/fxs/fxs.lst
file modified
+1 -0
toonz/sources/include/toonzqt/paramfield.h
file modified
+2 -0
toonz/sources/include/tparamuiconcept.h
file modified
+2 -0
toonz/sources/stdfx/CMakeLists.txt
file modified
+2 -0
toonz/sources/stdfx/iwa_floorbumpfx.cpp
file added
+1475
toonz/sources/stdfx/iwa_floorbumpfx.h
file added
+163
toonz/sources/tnztools/edittoolgadgets.cpp
file modified
+81 -0
toonz/sources/toonz/icons/dark/actions/20/eraser_polyline.svg
file modified
+5 -13
toonz/sources/toonz/icons/dark/actions/20/eraser_segment.svg
file modified
+15 -22
toonz/sources/toonz/icons/dark/actions/20/fill_freepick.svg
file added
+10
toonz/sources/toonz/icons/dark/actions/20/fill_polyline.svg
file modified
+5 -13
toonz/sources/toonz/icons/dark/actions/20/type_erase_segment.svg
file added
+18
toonz/sources/toonz/icons/dark/actions/20/type_lasso.svg
file modified
+6 -16
toonz/sources/toonz/icons/dark/actions/20/type_normal.svg
file modified
+5 -24
toonz/sources/toonz/icons/dark/actions/20/type_pickerlasso.svg
file modified
+11 -18
toonz/sources/toonz/icons/dark/actions/20/type_polyline.svg
file modified
+5 -13
toonz/sources/toonz/icons/dark/actions/20/type_rectangular.svg
file modified
+5 -13
toonz/sources/toonz/toonz.qrc
file modified
+1 -0
toonz/sources/toonz/versioncontrol.cpp
file modified
+2 -2
toonz/sources/toonzqt/fxsettings.cpp
file modified
+3 -2
toonz/sources/toonzqt/paramfield.cpp
file modified
+4 -1
file modified
+2 -2
file modified
+20 -1