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

[Sergey Sharybin]

Commit: 21aca14e43326ea9af45f1e848ebca52808f8470
Author: Sergey Sharybin
Date:   Mon Mar 26 14:56:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB21aca14e43326ea9af45f1e848ebca52808f8470

Merge branch 'master' into blender2.8

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



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

diff --cc intern/ghost/test/CMakeLists.txt
index ef6e8915871,e93832c9b4e..da387094619
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@@ -203,6 -203,8 +203,11 @@@ target_link_libraries(gears_
  		glewmx_lib
  		string_lib
  		${OPENGL_gl_LIBRARY}
++<<<<<<< HEAD
++=======
+ 		${OPENGL_glu_LIBRARY}
+ 		${CMAKE_DL_LIBS}
++>>>>>>> master
  		${PLATFORM_LINKLIBS}
  		)
  
@@@ -216,6 -218,8 +221,11 @@@ target_link_libraries(gears_cp
  		glewmx_lib
  		string_lib
  		${OPENGL_gl_LIBRARY}
++<<<<<<< HEAD
++=======
+ 		${OPENGL_glu_LIBRARY}
+ 		${CMAKE_DL_LIBS}
++>>>>>>> master
  		${PLATFORM_LINKLIBS}
  		)
  
@@@ -246,7 -250,9 +256,8 @@@ target_link_libraries(multitest_
  		guardedalloc_lib
  		wcwidth_lib
  		${OPENGL_gl_LIBRARY}
 -		${OPENGL_glu_LIBRARY}
  		${FREETYPE_LIBRARY}
  		${ZLIB_LIBRARIES}
+ 		${CMAKE_DL_LIBS}
  		${PLATFORM_LINKLIBS}
  		)
diff --cc source/blender/blenfont/BLF_api.h
index 22559edad22,f31c132c973..cd3a15f1c88
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@@ -33,10 -33,8 +33,11 @@@
  #define __BLF_API_H__
  
  #include "BLI_compiler_attrs.h"
+ #include "BLI_sys_types.h"
  
 +/* enable this only if needed (unused circa 2016) */
 +#define BLF_BLUR_ENABLE 0
 +
  struct rctf;
  struct ColorManagedDisplay;
  struct ResultBLF;
@@@ -45,8 -43,10 +46,11 @@@ int BLF_init(void)
  void BLF_exit(void);
  void BLF_default_dpi(int dpi);
  void BLF_default_set(int fontid);
 +int BLF_default(void); /* get default font ID so we can pass it to other functions */
  
+ void BLF_antialias_set(bool enabled);
+ bool BLF_antialias_get(void);
+ 
  void BLF_cache_clear(void);
  
  int BLF_load(const char *name) ATTR_NONNULL();
diff --cc source/blender/blenfont/intern/blf.c
index 0cca1852c91,b45e52f29fd..8e705616c41
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@@ -176,12 -176,16 +177,22 @@@ void BLF_default_set(int fontid
  	}
  }
  
 +int BLF_default(void)
 +{
 +	ASSERT_DEFAULT_SET;
 +	return global_font_default;
 +}
 +
+ void BLF_antialias_set(bool enabled)
+ {
+ 	global_use_antialias = enabled;
+ }
+ 
+ bool BLF_antialias_get(void)
+ {
+ 	return global_use_antialias;
+ }
+ 
  int BLF_load(const char *name)
  {
  	FontBLF *font;
diff --cc source/blender/blenfont/intern/blf_glyph.c
index 5a8691c9b4f,c90e60bd6ef..1f31a2dbd0a
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@@ -56,7 -56,7 +56,7 @@@
  #include "BLF_api.h"
  
  #ifndef BLF_STANDALONE
- #include "GPU_immediate.h"
 -#  include "GPU_basic_shader.h"
++#  include "GPU_immediate.h"
  #endif
  
  #include "blf_internal_types.h"