diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-08 06:12:23 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-08 06:12:23 (GMT) |
| commit | 6c9e1cb72a3feef2ebeb1fbf7c407c7d804a6338 (patch) | |
| tree | a0b613280af7c7723db4be067e847e772a9f6a58 | |
| parent | f2f019f57ea1923e5378b36f463335888f262b56 (diff) | |
| parent | 9e78c066f9a96f9b5fca360844dd42acde2ef3a9 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | RELEASE_NOTES | 8 | ||||
| -rwxr-xr-x | scripts/uni-get-dependencies.sh | 7 | ||||
| -rw-r--r-- | src/mainwin.cc | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 870b498..1de208a 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,4 +1,4 @@ -OpenSCAD 2013.05 +OpenSCAD 2013.06 ================ Language Features: @@ -17,7 +17,7 @@ o Added basic syntax highlighting in the editor o There is now a built-in library path in user-space: http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Libraries#Library_Locations o Commandline output to PNG, with various camera and rendering settings. - Run openscad -h to see usage info. + Run openscad -h to see usage info or see the OpenSCAD wiki user manual. o Attempting to open dxf, off or stl files in the GUI will now create an import statement. o The preview operator (%) will now preserve any manually set color o The highlight operator (#) will now color the object in transparent red @@ -47,6 +47,10 @@ o Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine o The backend is finally independent of Qt o Windows: We now have a 64-bit version +Known Bugs: +o Linux: command-line png rendering on Gallium is flaky. + Workaround: use CGAL --render or hardware rendering. + OpenSCAD 2013.01 ================ diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index e2fdaa7..54e63d5 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -7,8 +7,9 @@ get_fedora_deps() { sudo yum install qt-devel bison flex eigen2-devel python-paramiko \ - boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig \ - git libXmu-devel curl imagemagick + boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \ + opencsg-devel git libXmu-devel curl imagemagick ImageMagick make \ + xorg-x11-server-Xvfb } get_qomo_deps() @@ -74,6 +75,8 @@ if [ -e /etc/issue ]; then get_debian_deps elif [ "`grep -i debian /etc/issue`" ]; then get_debian_deps + elif [ "`grep -i mint /etc/issue`" ]; then + get_debian_deps elif [ "`grep -i suse /etc/issue`" ]; then get_opensuse_deps elif [ "`grep -i fedora /etc/issue`" ]; then diff --git a/src/mainwin.cc b/src/mainwin.cc index 946bc2a..d10337d 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -655,7 +655,11 @@ bool MainWindow::compile(bool reload, bool procevents) if (procevents) QApplication::processEvents(); AbstractNode::resetIndexCounter(); - this->root_inst = ModuleInstantiation("group"); + + // split these two lines - gcc 4.7 bug + ModuleInstantiation mi = ModuleInstantiation( "group" ); + this->root_inst = mi; + this->absolute_root_node = this->root_module->instantiate(&top_ctx, &this->root_inst, NULL); if (this->absolute_root_node) { |