From ca403304e5482bc7ff34f1ea6f5fd9a845031bab Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Wed, 25 Sep 2013 07:59:59 +0200 Subject: [PATCH 1/2] OpenSCADimport: fixed centering of linear extrude --- src/Mod/OpenSCAD/importCSG.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py index ecf689fdf..702225380 100644 --- a/src/Mod/OpenSCAD/importCSG.py +++ b/src/Mod/OpenSCAD/importCSG.py @@ -567,12 +567,12 @@ def p_linear_extrude_with_twist(p): else : obj = p[6][0] if t: - newobj = [process_linear_extrude_with_twist(obj,h,t)] + newobj = process_linear_extrude_with_twist(obj,h,t) else: - newobj = [process_linear_extrude(obj,h)] + newobj = process_linear_extrude(obj,h) if p[3]['center']=='true' : center(newobj,0,0,h) - p[0] = newobj + p[0] = [newobj] if printverbose: print "End Linear Extrude with twist" def p_import_file1(p): From 9e3f4824bd1cceadcdfacaf2161e023d15aed9eb Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Thu, 26 Sep 2013 14:24:48 +0200 Subject: [PATCH 2/2] relicense Keith's contributions under LGPL Date: Thu, 26 Sep 2013 10:03:48 +0100 From: Keith Sloan To: Sebastian Hoogen Message-ID: In-Reply-To: Subject: Re: OpenSCAD license Happy to relicense under LGPL --- src/Mod/OpenSCAD/exportCSG.py | 2 +- src/Mod/OpenSCAD/importCSG.py | 2 +- src/Mod/OpenSCAD/tokrules.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/OpenSCAD/exportCSG.py b/src/Mod/OpenSCAD/exportCSG.py index aa3ad720b..27cfd569f 100644 --- a/src/Mod/OpenSCAD/exportCSG.py +++ b/src/Mod/OpenSCAD/exportCSG.py @@ -4,7 +4,7 @@ #* Copyright (c) 2012 Keith Sloan * #* * #* This program is free software; you can redistribute it and/or modify * -#* it under the terms of the GNU General Public License (GPL) * +#* it under the terms of the GNU Lesser General Public License (LGPL) * #* as published by the Free Software Foundation; either version 2 of * #* the License, or (at your option) any later version. * #* for detail see the LICENCE text file. * diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py index 702225380..b82e4cd04 100644 --- a/src/Mod/OpenSCAD/importCSG.py +++ b/src/Mod/OpenSCAD/importCSG.py @@ -5,7 +5,7 @@ #* Copyright (c) 2012 Keith Sloan * #* * #* This program is free software; you can redistribute it and/or modify * -#* it under the terms of the GNU General Public License (GPL) * +#* it under the terms of the GNU Lesser General Public License (LGPL) * #* as published by the Free Software Foundation; either version 2 of * #* the License, or (at your option) any later version. * #* for detail see the LICENCE text file. * diff --git a/src/Mod/OpenSCAD/tokrules.py b/src/Mod/OpenSCAD/tokrules.py index 3bddf87c6..0cfac92d5 100644 --- a/src/Mod/OpenSCAD/tokrules.py +++ b/src/Mod/OpenSCAD/tokrules.py @@ -5,7 +5,7 @@ #* Copyright (c) 2012 Keith Sloan * #* * #* This program is free software; you can redistribute it and/or modify * -#* it under the terms of the GNU General Public License (GPL) * +#* it under the terms of the GNU Lesser General Public License (LGPL) * #* as published by the Free Software Foundation; either version 2 of * #* the License, or (at your option) any later version. * #* for detail see the LICENCE text file. *