mirror of https://github.com/vitalif/openscad
Merge remote-tracking branch 'origin/master' into gridfix
commit
b302cb172b
|
@ -136,11 +136,11 @@ void FontListDialog::update_font_list()
|
|||
QString FontListDialog::quote(const QString& text)
|
||||
{
|
||||
QString result = text;
|
||||
result.replace('\\', "\\\\")
|
||||
.replace('-', "\\-")
|
||||
.replace(':', "\\:")
|
||||
.replace(',', "\\,")
|
||||
.replace('=', "\\=")
|
||||
.replace('_', "\\_");
|
||||
result.replace('\\', "\\\\\\\\")
|
||||
.replace('-', "\\\\-")
|
||||
.replace(':', "\\\\:")
|
||||
.replace(',', "\\\\,")
|
||||
.replace('=', "\\\\=")
|
||||
.replace('_', "\\\\_");
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
#include <CGAL/config.h>
|
||||
#include <CGAL/version.h>
|
||||
|
||||
// Apply CGAL bugfix. Note: If using CGAL < 4.3, hull() might be buggy
|
||||
#if CGAL_VERSION_NR > CGAL_VERSION_NUMBER(4,5,1) || CGAL_VERSION_NR < CGAL_VERSION_NUMBER(4,3,0)
|
||||
// Apply CGAL bugfix for CGAL-4.5.x
|
||||
#if CGAL_VERSION_NR > CGAL_VERSION_NUMBER(4,5,1) || CGAL_VERSION_NR < CGAL_VERSION_NUMBER(4,5,0)
|
||||
#include <CGAL/convex_hull_3.h>
|
||||
#else
|
||||
#include "convex_hull_3_bugfix.h"
|
||||
|
|
Loading…
Reference in New Issue