diff options
Diffstat (limited to 'source')
29 files changed, 28 insertions, 30 deletions
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_vfont.h index 827ae1b6a0f..827ae1b6a0f 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_vfont.h diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index e727730770c..47c1d698360 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -143,7 +143,6 @@ set(SRC intern/fcurve_driver.c intern/fluid.c intern/fmodifier.c - intern/font.c intern/freestyle.c intern/geometry_component_curve.cc intern/geometry_component_instances.cc @@ -289,6 +288,7 @@ set(SRC intern/tracking_util.c intern/undo_system.c intern/unit.c + intern/vfont.c intern/vfontdata_freetype.c intern/volume.cc intern/volume_render.cc @@ -364,7 +364,6 @@ set(SRC BKE_fcurve.h BKE_fcurve_driver.h BKE_fluid.h - BKE_font.h BKE_freestyle.h BKE_geometry_set.h BKE_geometry_set.hh @@ -457,6 +456,7 @@ set(SRC BKE_tracking.h BKE_undo_system.h BKE_unit.h + BKE_vfont.h BKE_vfontdata.h BKE_volume.h BKE_volume_render.h diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 371ec14876b..07ac0086f0d 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -66,13 +66,13 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_font.h" #include "BKE_image.h" #include "BKE_lib_id.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_report.h" +#include "BKE_vfont.h" #include "BKE_bpath.h" /* own include */ diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 0dcfea78ca5..b0fc1426093 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -52,13 +52,13 @@ #include "BKE_curve.h" #include "BKE_curveprofile.h" #include "BKE_displist.h" -#include "BKE_font.h" #include "BKE_idtype.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_object.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/curve_convert.c b/source/blender/blenkernel/intern/curve_convert.c index 5bcce9c339e..98a9cbc2bcf 100644 --- a/source/blender/blenkernel/intern/curve_convert.c +++ b/source/blender/blenkernel/intern/curve_convert.c @@ -26,9 +26,9 @@ #include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_font.h" #include "BKE_lib_id.h" #include "BKE_modifier.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index 0776f3b9a68..ebe00531e65 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -47,7 +47,6 @@ #include "BKE_anim_path.h" #include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_font.h" #include "BKE_geometry_set.hh" #include "BKE_key.h" #include "BKE_lattice.h" @@ -58,6 +57,7 @@ #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_spline.hh" +#include "BKE_vfont.h" #include "BLI_sys_types.h" /* For #intptr_t support. */ diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 59e431b737c..5117c8bd64c 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -1918,7 +1918,7 @@ void BKE_lib_override_library_delete(Main *bmain, ID *id_root) */ void BKE_lib_override_library_make_local(ID *id) { - if (!ID_IS_OVERRIDE_LIBRARY(id)) { + if (!ID_IS_OVERRIDE_LIBRARY(id)) { return; } if (ID_IS_OVERRIDE_LIBRARY_VIRTUAL(id)) { diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index fa3fbd457d1..6c57d3139bb 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -63,7 +63,6 @@ #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_font.h" #include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_idtype.h" @@ -76,6 +75,7 @@ #include "BKE_node.h" #include "BKE_object.h" #include "BKE_scene.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index ec39c5b45c4..274f0394618 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -94,7 +94,6 @@ #include "BKE_effect.h" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_font.h" #include "BKE_geometry_set.h" #include "BKE_global.h" #include "BKE_gpencil.h" @@ -136,6 +135,7 @@ #include "BKE_speaker.h" #include "BKE_subdiv_ccg.h" #include "BKE_subsurf.h" +#include "BKE_vfont.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index 04739ec19d3..58b19805407 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -50,7 +50,6 @@ #include "BKE_duplilist.h" #include "BKE_editmesh.h" #include "BKE_editmesh_cache.h" -#include "BKE_font.h" #include "BKE_geometry_set.h" #include "BKE_geometry_set.hh" #include "BKE_global.h" @@ -63,6 +62,7 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index baff1bb47cc..95763b0da54 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -43,12 +43,12 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_font.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_sound.h" +#include "BKE_vfont.h" #include "BKE_volume.h" #include "IMB_imbuf.h" diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/vfont.c index d749237971a..e650ae696b5 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/vfont.c @@ -50,7 +50,7 @@ #include "BKE_anim_path.h" #include "BKE_curve.h" -#include "BKE_font.h" +#include "BKE_vfont.h" #include "BKE_global.h" #include "BKE_idtype.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index 3b7463affc0..bf7547cc90b 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -64,7 +64,6 @@ const char *BLI_str_find_prev_char_utf8(const char *p, const char *str_start) const char *BLI_str_find_next_char_utf8(const char *p, const char *str_end) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1, 2); -/* wchar_t functions, copied from blenders own font.c originally */ size_t BLI_wstrlen_utf8(const wchar_t *src) ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT; size_t BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes) ATTR_NONNULL(1, 2) ATTR_WARN_UNUSED_RESULT; diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.c b/source/blender/draw/engines/overlay/overlay_edit_text.c index 5356700f156..b899767acc4 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.c +++ b/source/blender/draw/engines/overlay/overlay_edit_text.c @@ -22,7 +22,7 @@ #include "DRW_render.h" -#include "BKE_font.h" +#include "BKE_vfont.h" #include "DNA_curve_types.h" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index dc8f382b7f8..1108d40125b 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -36,9 +36,9 @@ #include "BKE_curve.h" #include "BKE_displist.h" -#include "BKE_font.h" #include "BKE_geometry_set.hh" #include "BKE_spline.hh" +#include "BKE_vfont.h" #include "GPU_batch.h" #include "GPU_capabilities.h" diff --git a/source/blender/draw/intern/draw_manager_profiling.c b/source/blender/draw/intern/draw_manager_profiling.c index 70fe12270f5..87d4c34b3ed 100644 --- a/source/blender/draw/intern/draw_manager_profiling.c +++ b/source/blender/draw/intern/draw_manager_profiling.c @@ -257,8 +257,7 @@ void DRW_stats_draw(const rcti *rect) /* Engines rows */ char time_to_txt[16]; - DRW_ENABLED_ENGINE_ITER(DST.view_data_active, engine, data) - { + DRW_ENABLED_ENGINE_ITER (DST.view_data_active, engine, data) { u = 0; draw_stat_5row(rect, u++, v, engine->idname, sizeof(engine->idname)); diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index d029bb539ba..1b44cf88db1 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -42,11 +42,11 @@ #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_font.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c index 6eaf8971eb0..21a6564edf4 100644 --- a/source/blender/editors/curve/editfont_undo.c +++ b/source/blender/editors/curve/editfont_undo.c @@ -33,9 +33,9 @@ #include "DNA_scene_types.h" #include "BKE_context.h" -#include "BKE_font.h" #include "BKE_main.h" #include "BKE_undo_system.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index cc4f2acc346..4b2315c0552 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -65,7 +65,6 @@ #include "BKE_displist.h" #include "BKE_duplilist.h" #include "BKE_effect.h" -#include "BKE_font.h" #include "BKE_geometry_set.h" #include "BKE_gpencil_curve.h" #include "BKE_gpencil_geom.h" @@ -92,6 +91,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_speaker.h" +#include "BKE_vfont.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 7b2667905ff..b6e6869f4e2 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -48,7 +48,6 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editmesh.h" -#include "BKE_font.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" @@ -61,6 +60,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_texture.h" +#include "BKE_vfont.h" #include "BKE_workspace.h" #include "BKE_world.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 15ccf5891d4..6f51d740e55 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -47,7 +47,6 @@ #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_context.h" -#include "BKE_font.h" #include "BKE_gpencil_geom.h" #include "BKE_layer.h" #include "BKE_lib_id.h" @@ -57,6 +56,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" +#include "BKE_vfont.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 1113ac0eb45..1776da7e62d 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -225,7 +225,6 @@ const struct IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "BLI_math_base.h" # include "BKE_anim_data.h" -# include "BKE_font.h" # include "BKE_global.h" /* XXX, remove me */ # include "BKE_idprop.h" # include "BKE_idtype.h" @@ -234,6 +233,7 @@ const struct IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "BKE_lib_remap.h" # include "BKE_library.h" # include "BKE_material.h" +# include "BKE_vfont.h" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 0bfb1200f49..8c89162f571 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -30,7 +30,7 @@ #include "BLT_translation.h" -#include "BKE_font.h" +#include "BKE_vfont.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 9a33849b645..0276c8a3f8a 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -47,7 +47,6 @@ # include "BKE_collection.h" # include "BKE_curve.h" # include "BKE_displist.h" -# include "BKE_font.h" # include "BKE_gpencil.h" # include "BKE_hair.h" # include "BKE_icons.h" @@ -74,6 +73,7 @@ # include "BKE_speaker.h" # include "BKE_text.h" # include "BKE_texture.h" +# include "BKE_vfont.h" # include "BKE_volume.h" # include "BKE_workspace.h" # include "BKE_world.h" diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 10ba2b9acb1..10094ade711 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -69,7 +69,6 @@ static const EnumPropertyItem space_items[] = { # include "BKE_constraint.h" # include "BKE_context.h" # include "BKE_customdata.h" -# include "BKE_font.h" # include "BKE_global.h" # include "BKE_layer.h" # include "BKE_main.h" @@ -78,6 +77,7 @@ static const EnumPropertyItem space_items[] = { # include "BKE_modifier.h" # include "BKE_object.h" # include "BKE_report.h" +# include "BKE_vfont.h" # include "ED_object.h" # include "ED_screen.h" diff --git a/source/blender/makesrna/intern/rna_vfont.c b/source/blender/makesrna/intern/rna_vfont.c index 214a32372dd..f5f7742d753 100644 --- a/source/blender/makesrna/intern/rna_vfont.c +++ b/source/blender/makesrna/intern/rna_vfont.c @@ -30,7 +30,7 @@ #ifdef RNA_RUNTIME -# include "BKE_font.h" +# include "BKE_vfont.h" # include "DNA_object_types.h" # include "DEG_depsgraph.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc index 5e2f03806c3..3eec2279f24 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc @@ -18,8 +18,8 @@ #include "DNA_vfont_types.h" #include "BKE_curve.h" -#include "BKE_font.h" #include "BKE_spline.hh" +#include "BKE_vfont.h" #include "BLI_hash.h" #include "BLI_string_utf8.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index ad04416613a..d4ef14bbf5d 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -56,7 +56,6 @@ #include "BKE_blendfile.h" #include "BKE_callbacks.h" #include "BKE_context.h" -#include "BKE_font.h" #include "BKE_global.h" #include "BKE_icons.h" #include "BKE_image.h" @@ -69,6 +68,7 @@ #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_sound.h" +#include "BKE_vfont.h" #include "BKE_addon.h" #include "BKE_appdir.h" diff --git a/source/creator/creator.c b/source/creator/creator.c index 2ec4a2aa616..7c99f954bfc 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -54,7 +54,6 @@ #include "BKE_cachefile.h" #include "BKE_callbacks.h" #include "BKE_context.h" -#include "BKE_font.h" #include "BKE_global.h" #include "BKE_gpencil_modifier.h" #include "BKE_idtype.h" @@ -65,6 +64,7 @@ #include "BKE_particle.h" #include "BKE_shader_fx.h" #include "BKE_sound.h" +#include "BKE_vfont.h" #include "BKE_volume.h" #include "DEG_depsgraph.h" |