vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes problem where local changes are overwritten on automatic reload when included files has changed. Fixes #162

felipesanches-svg
Marius Kintel 2013-03-11 21:05:53 -04:00
parent 4b7fe104f0
commit 9899f75a25
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@ -19,6 +19,7 @@ o Fixed some issues related to ARM builds
o Changed multmatrix floating-point output to improve dumptest portability
o Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine
o CGAL triangulation more lenient- enables partial rendering of 'bad' DXF data
o Fixes problem where local changes are overwritten on automatic reload when included files has changed.
OpenSCAD 2013.01
================

5
src/mainwin.cc
View File

@ -1040,8 +1040,9 @@ bool MainWindow::compileTopLevelDocument(bool reload)
{
bool shouldcompiletoplevel = !reload;
if ((reload && fileChangedOnDisk() && checkEditorModified()) ||
includesChanged()) {
if (includesChanged()) shouldcompiletoplevel = true;
if (reload && fileChangedOnDisk() && checkEditorModified()) {
shouldcompiletoplevel = true;
refreshDocument();
}