diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-25 15:46:21 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-25 15:46:21 (GMT) |
| commit | 08c83d306ed838165546e55d8e91a8445b09ace3 (patch) | |
| tree | 863b749cfe3a875a211062aa0281c648ef721d5e /src | |
| parent | cb0fe366cf1947973728d50c06e3ed0e4261e109 (diff) | |
| parent | a32007e66c6004531f812befb20a96040b4dbbdd (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/primitives.cc
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwin.cc | 1 | ||||
| -rw-r--r-- | src/primitives.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index 2cd16be..fab0c74 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1489,6 +1489,7 @@ void MainWindow::actionFlushCaches() #endif dxf_dim_cache.clear(); dxf_cross_cache.clear(); + Module::libs_cache.clear(); } void MainWindow::viewModeActionsUncheck() diff --git a/src/primitives.cc b/src/primitives.cc index 3f88c75..4210e15 100644 --- a/src/primitives.cc +++ b/src/primitives.cc @@ -474,7 +474,7 @@ sphere_next_r2: } } - if (this->type == SQUARE) + if (this->type == SQUARE && x > 0 && y > 0) { double x1, x2, y1, y2; if (this->center) { |