diff --git a/Source/Fractorium/Fractorium.cpp b/Source/Fractorium/Fractorium.cpp index a3646c1..02a794f 100644 --- a/Source/Fractorium/Fractorium.cpp +++ b/Source/Fractorium/Fractorium.cpp @@ -47,10 +47,6 @@ Fractorium::Fractorium(QWidget* p) m_VarSortMode = 1;//Sort by weight by default. m_PaletteSortMode = 0;//Sort by palette ascending by default. m_ColorDialog = new QColorDialog(this); -#ifdef __APPLE__ - //Fixes crashing problem when closing Fractorium in Mac OS 10.12 Sierra. - m_ColorDialog->setOption(QColorDialog::NoButtons); -#endif m_Settings = FractoriumSettings::Instance(); m_QssDialog = new QssDialog(this); m_FinalRenderDialog = new FractoriumFinalRenderDialog(this); diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index 779810f..c1ad13c 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -255,7 +255,7 @@ void GLWidget::paintGL() glEnable(GL_LINE_SMOOTH); glEnable(GL_POINT_SMOOTH); #if defined (__APPLE__) || defined(MACOSX) - glBlendFunc(GL_SRC_ALPHA, GL_ONE); + glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_COLOR); #else glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); #endif @@ -793,7 +793,7 @@ bool GLWidget::Allocate(bool force) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); #if defined (__APPLE__) || defined(MACOSX) - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, m_TexWidth, m_TexHeight, 0, GL_RGB, GL_FLOAT, nullptr); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, m_TexWidth, m_TexHeight, 0, GL_RGB, GL_FLOAT, nullptr); #else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, m_TexWidth, m_TexHeight, 0, GL_RGBA, GL_FLOAT, nullptr); #endif diff --git a/archive/build.sh b/archive/build.sh index ff5050b..4c6bbab 100644 --- a/archive/build.sh +++ b/archive/build.sh @@ -2,8 +2,8 @@ OSX_BUILD_PATH=$PWD FRACTORIUM_RELEASE_ROOT=$PWD/../Bin/release -# replace 5.4 by your QT version, and check if the instation path is the same -QT_MACDEPLOY=~/Qt/5.4/clang_64/bin/macdeployqt +# replace 5.9 by your QT version, and check if the instation path is the same +QT_MACDEPLOY=~/Qt/5.9.3/clang_64/bin/macdeployqt cd $FRACTORIUM_RELEASE_ROOT @@ -11,6 +11,7 @@ EMBERANIMATE_FINAL_ROOT=$PWD/emberanimate.app/Contents/MacOS EMBERGENOME_FINAL_ROOT=$PWD/embergenome.app/Contents/MacOS EMBERRENDER_FINAL_ROOT=$PWD/emberrender.app/Contents/MacOS FRACTORIUM_FINAL_ROOT=$PWD/fractorium.app/Contents/MacOS +FRACTORIUM_FINAL_FRAMEWORKS=$PWD/fractorium.app/Contents/Frameworks install_name_tool -id $PWD/libember.dylib libember.dylib install_name_tool -id $PWD/libembercl.dylib libembercl.dylib @@ -37,6 +38,12 @@ cp ./emberanimate.app/Contents/MacOS/emberanimate $FRACTORIUM_FINAL_ROOT cp ./embergenome.app/Contents/MacOS/embergenome $FRACTORIUM_FINAL_ROOT cp ./emberrender.app/Contents/MacOS/emberrender $FRACTORIUM_FINAL_ROOT +#solving macdeployqt 5.9.3 bug (wasn't necessary when using 5.4.2) +cd $FRACTORIUM_FINAL_FRAMEWORKS +install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libIexMath-2_2.12.dylib +install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libIlmThread-2_2.12.dylib +install_name_tool -change /usr/local/Cellar/ilmbase/2.2.0/lib/libIex-2_2.12.dylib @executable_path/../Frameworks/libIex-2_2.12.dylib libImath-2_2.12.dylib + cd $OSX_BUILD_PATH cd ../Data