Merge branch 'master' into earcut-polygon

Conflicts: tile.cc
2026-10-05 01:45:41 +02:00 · 2016-04-26 12:09:56 -07:00
parent 62a74afbdc 2607a76c63
commit 8c82ee4c5f
18 changed files with 6701 additions and 17 deletions
@@ -73,4 +73,8 @@ static int prevent_options[] = {
 	P_INPUT_ORDER,
 #define P_POLYGON_SPLIT ((int) 'p')
 	P_POLYGON_SPLIT,
+#define P_CLIPPING ((int) 'c')
+	P_CLIPPING,
+#define P_DUPLICATION ((int) 'D')
+	P_DUPLICATION,
 };