Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Merge branch 'master' into Fix-geoArc-thick

Abel_You994ece41ce32
diff --cc toonz/sources/tnztools/toonzvectorbrushtool.cpp
index dbc834d10,aa9771322..5f5ad33d5
--- a/toonz/sources/tnztools/toonzvectorbrushtool.cpp
+++ b/toonz/sources/tnztools/toonzvectorbrushtool.cpp
@@@ -52,8 -52,9 +52,9 @@@ TEnv::DoubleVar V_VectorBrushMaxSize("I
TEnv::IntVar V_VectorCapStyle("InknpaintVectorCapStyle", 1);
TEnv::IntVar V_VectorJoinStyle("InknpaintVectorJoinStyle", 1);
TEnv::IntVar V_VectorMiterValue("InknpaintVectorMiterValue", 4);
-TEnv::DoubleVar V_BrushAccuracy("InknpaintBrushAccuracy", 20);
-TEnv::DoubleVar V_BrushSmooth("InknpaintBrushSmooth", 0);
+TEnv::DoubleVar V_BrushAccuracy("InknpaintBrushAccuracy", 100);
+TEnv::DoubleVar V_BrushSmooth("InknpaintBrushSmooth", 0.5);
+ TEnv::IntVar V_BrushDrawOrder("InknpaintVectorDrawOrder", 2);
TEnv::IntVar V_BrushBreakSharpAngles("InknpaintBrushBreakSharpAngles", 0);
TEnv::IntVar V_BrushPressureSensitivity("InknpaintBrushPressureSensitivity", 1);
TEnv::IntVar V_VectorBrushFrameRange("VectorBrushFrameRange", 0);
@@@ -496,9 -525,10 +525,10 @@@ double computeThickness(double pressure
ToonzVectorBrushTool::ToonzVectorBrushTool(std::string name, int targetType)
: TTool(name)
- , m_thickness("Size", 0, 1000, 0, 5)
+ , m_thickness("Size", 0, 1000, 1, 5)
, m_accuracy("Accuracy:", 1, 100, 20)
, m_smooth("Smooth:", 0, 50, 0)
+ , m_drawOrder("Draw Order")
, m_preset("Preset:")
, m_breakAngles("Break", true)
, m_pressure("Pressure", true)