|
From: Sebastian H. <seb...@ho...> - 2012-10-21 15:23:41
|
Dear core devs, please consider merging th following changed inside the OpenSCAD module into the master. This will also resolve ticket 828, so this one should be closed as well. Thanks Sebastian The following changes since commit 5db59ce2581b361ade851b22a6b380b673a781cb: Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad (2012-10-18 10:31:52 +0200) are available in the git repository at: git://github.com/5263/FreeCAD.git review-openscad for you to fetch changes up to 8d2be1acaec4095d228ced520266e65e75693c45: keep up with upstream version 0.5d of importCSG (2012-10-21 16:17:07 +0200) ---------------------------------------------------------------- shoogen (3): handle OpenSCAD keyword arguments as such Enhancements to OpenSCAD module keep up with upstream version 0.5d of importCSG src/Mod/OpenSCAD/CMakeLists.txt | 1 - src/Mod/OpenSCAD/Init.py | 8 + src/Mod/OpenSCAD/InitGui.py | 24 +- src/Mod/OpenSCAD/Makefile.am | 1 - src/Mod/OpenSCAD/OpenSCADCommands.py | 84 +- src/Mod/OpenSCAD/OpenSCADFeatures.py | 32 + src/Mod/OpenSCAD/OpenSCAD_rc.py | 2550 +++++++++++++------- src/Mod/OpenSCAD/Resources/OpenSCAD.qrc | 1 + .../icons/OpenSCAD_AddOpenSCADElement.svg | 305 +++ .../OpenSCAD/Resources/translations/OpenSCAD.ts | 290 +++ .../OpenSCAD/Resources/ui/openscadprefs-base.ui | 20 - src/Mod/OpenSCAD/TODO | 5 - src/Mod/OpenSCAD/importCSG.py | 410 ++-- src/Mod/OpenSCAD/importVersions.txt | 5 +- src/Mod/OpenSCAD/prototype.py | 21 +- src/Mod/OpenSCAD/tokrules.py | 15 +- src/Tools/updatets.py | 3 + src/WindowsInstaller/ModOpenSCAD.wxi | 1 - 18 files changed, 2664 insertions(+), 1112 deletions(-) create mode 100644 src/Mod/OpenSCAD/Resources/icons/OpenSCAD_AddOpenSCADElement.svg create mode 100644 src/Mod/OpenSCAD/Resources/translations/OpenSCAD.ts delete mode 100644 src/Mod/OpenSCAD/TODO |