[Bf-blender-cvs] [8205a193234] blender2.8: Fix WITH_LEGACY_OPENGL=ON

Campbell Barton noreply at git.blender.org
Sat Apr 8 04:01:43 CEST 2017


Commit: 8205a1932341834f31d5efd16cef51bc66eab9de
Author: Campbell Barton
Date:   Sat Apr 8 12:00:46 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB8205a1932341834f31d5efd16cef51bc66eab9de

Fix WITH_LEGACY_OPENGL=ON

This wasn't working outside of gpu module.

===================================================================

M	source/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt

===================================================================

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index c696719e650..4e4724771f3 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -23,6 +23,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+if(WITH_LEGACY_OPENGL)
+	add_definitions(-DWITH_LEGACY_OPENGL)
+endif()
+
 add_subdirectory(blender)
 
 if(WITH_GAMEENGINE)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 29ad827c6bc..6a61b93e621 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -236,9 +236,5 @@ if(WITH_OPENSUBDIV)
 	add_definitions(-DWITH_OPENSUBDIV)
 endif()
 
-if(WITH_LEGACY_OPENGL)
-	add_definitions(-DWITH_LEGACY_OPENGL)
-endif()
-
 blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list