fix glBlendFunc under Linux

chongyangma · Jan 26, 2017 · 73d4a1b · 73d4a1b
1 parent 887676d
commit 73d4a1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,6 @@ before_build:
   - cmd: cd C:\projects\ElementSyn
   - cmd: md build
   - cmd: cd build
-  # We generate project files for Visual Studio 12 because the boost binaries installed on the test server are for Visual Studio 12.
   - cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
   - cmd: if "%platform%"=="x64"   set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
   - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% ../

diff --git a/src/ParticleSystem/ParticleSystemMain.cpp b/src/ParticleSystem/ParticleSystemMain.cpp
@@ -229,10 +229,10 @@ void Initialize(const char* config_file_path)
 	glEnable(GL_POLYGON_SMOOTH);
 	glEnable(GL_POLYGON_SMOOTH_HINT);
 	glEnable(GL_BLEND);
-#ifdef WIN32
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#else
+#ifdef __APPLE__
 	glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA);
+#else
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #endif
 	LoadCameraAndArcBall();
 }

diff --git a/src/TreeBranches/TreeBranchesMain.cpp b/src/TreeBranches/TreeBranchesMain.cpp
@@ -250,10 +250,10 @@ void Initialize(const char* config_file_path)
 	glEnable(GL_POLYGON_SMOOTH);
 	glEnable(GL_POLYGON_SMOOTH_HINT);
 	glEnable(GL_BLEND);
-#ifdef WIN32
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#else
+#ifdef __APPLE__
 	glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA);
+#else
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #endif
 	LoadCameraAndArcBall();
 }