Merge branch 'master' into tessellation

Conflicts: include/llmr/renderer/fill_bucket.hpp src/renderer/fill_bucket.cpp src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
parent ae3bd04171 675b8eb1fe
commit 4e73a4d47c
55 changed files with 1313 additions and 370 deletions
--- a/src/renderer/fill_bucket.cpp
+++ b/src/renderer/fill_bucket.cpp
@@ -96,7 +96,6 @@ void FillBucket::tessellate() {
    }
    hasVertices = false;

-
    std::vector<std::vector<ClipperLib::IntPoint>> polygons;
    clipper.Execute(ClipperLib::ctUnion, polygons, ClipperLib::pftPositive);
    clipper.Clear();