Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Mar 2018 12:56:00 +0000 (14:56 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 26 Mar 2018 12:56:00 +0000 (14:56 +0200)
12 files changed:
1  2 
intern/ghost/test/CMakeLists.txt
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenkernel/intern/text.c
source/blender/depsgraph/util/deg_util_function.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/space_text/text_ops.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c

index ef6e8915871b890f9c00b677b87ab250a9a40f08,e93832c9b4e8dde2232eaabd00d9238855d9ce2e..da387094619d7fd7f72fc4ebbeaf062bfe2d85b2
@@@ -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}
                )
index 22559edad22112a5a585b3818bf99cea48f67d9d,f31c132c973299f865ecb16b3d1cc06cf8c93ab4..cd3a15f1c8826781d02d21fdf85858b339960e54
  #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();
index 0cca1852c911239db372885403b9e63420557389,b45e52f29fd3c6bc76e4018567e2bc03a097b0a5..8e705616c41ec55dbebf83c92ed726a61184c3a1
@@@ -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;
index 5a8691c9b4ff8ead407d8e5ec53375ad3329e2d8,c90e60bd6efb0dab4bc1c736b87f1476fc1b1b6b..1f31a2dbd0a61a94115289d4795431f9974a9f69
@@@ -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"