merge with dev

2018-08-22 18:21:40 +02:00
parent 5472673b9e 3e7f19c81b
commit 47f0564d25
140 changed files with 3185 additions and 1208 deletions
--- a/rtengine/curves.h
+++ b/rtengine/curves.h
@@ -462,6 +462,7 @@ protected:
    DiagonalCurveType kind;

    void spline_cubic_set();
+    void catmull_rom_set();
    void NURBS_set();

 public: