[Bf-blender-cvs] [e54182427a4] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: e54182427a41d54a900deac5b55b09a2407e31f6
Author: Sergey Sharybin
Date:   Fri Dec 14 14:50:47 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe54182427a41d54a900deac5b55b09a2407e31f6

Merge branch 'master' into blender2.8

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



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

diff --cc CMakeLists.txt
index c40eb5bb2a0,02a35c1cd4c..3218bf9ba4b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1049,9 -1111,6 +1056,9 @@@ if(WITH_GL_PROFILE_ES20
  
  	endif()
  
 +else()
- 	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
++	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
 +
  endif()
  
  if(WITH_GL_EGL)