Merge branch 'hotfix/0.7.9b'

mkeeter · May 30, 2015 · 42e322c · 42e322c
2 parents 27fe5f6 + 216af51
commit 42e322c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/doc/release-notes/0.7.9.md b/doc/release-notes/0.7.9.md
@@ -17,3 +17,4 @@ Antimony 0.7.9
 - Fixed a few memory leaks of Python objects
 - Cancelling an export with Escape now actually stops the export task
 - Changed the way that images are drawn to prevent (?) `QGraphicsScene` crashes
+- Removed multisampling to fix crashes on Yosemite with integrated GPUs.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -15,7 +15,6 @@ int main(int argc, char *argv[])
     // Set the default OpenGL version to be 2.1 with sample buffers
     QSurfaceFormat format;
     format.setVersion(2, 1);
-    format.setSamples(2);
     QSurfaceFormat::setDefaultFormat(format);
 
     // Initialize the _fabtypes Python package and the Python interpreter