Fix issue with ClipEntities with empty intersection

This resulted in strange artifacts
Merge remote-tracking branch 'nazgee/for-nicolas-scissors-issues' into HEAD