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

[Campbell Barton]

Commit: 5300ba0ba50efb1656a2effa1053fb60875398ef
Author: Campbell Barton
Date:   Tue Jul 31 17:03:28 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB5300ba0ba50efb1656a2effa1053fb60875398ef

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenfont/BLF_api.h
index 90c0016d0ed,9bb3dd39aa6..f9ad1de8015
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@@ -46,12 -43,7 +46,9 @@@ 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_batch_reset(void); /* call when changing opengl context. */
  
- 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 b0e0cdac407,75aabf1f713..8e3f42e4d27
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@@ -184,22 -175,6 +183,12 @@@ 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;