blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: rename BKE_font.h -> BKE_vfont.h 

Match API naming prefix (BKE_vfont_*) and DNA_vfont_types.h.
This commit is contained in:
Campbell Barton 2021-10-06 11:15:53 +11:00
parent dcac86f4f1
commit b93e947306
29 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
source/blender/blenkernel/BKE_font.h → source/blender/blenkernel/BKE_vfont.h
View File

4
source/blender/blenkernel/CMakeLists.txt
View File

@ -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

2
source/blender/blenkernel/intern/bpath.c
View File

@ -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 */

2
source/blender/blenkernel/intern/curve.c
View File

@ -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"

2
source/blender/blenkernel/intern/curve_convert.c
View File

@ -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"

2
source/blender/blenkernel/intern/displist.cc
View File

@ -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. */

2
source/blender/blenkernel/intern/lib_override.c
View File

@ -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)) {

2
source/blender/blenkernel/intern/material.c
View File

@ -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"

2
source/blender/blenkernel/intern/object.c
View File

@ -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"

2
source/blender/blenkernel/intern/object_dupli.cc
View File

@ -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"

2
source/blender/blenkernel/intern/packedFile.c
View File

@ -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"

2
source/blender/blenkernel/intern/font.c → source/blender/blenkernel/intern/vfont.c
View File

@ -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"

1
source/blender/blenlib/BLI_string_utf8.h
View File

@ -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;

2
source/blender/draw/engines/overlay/overlay_edit_text.c
View File

@ -22,7 +22,7 @@
#include "DRW_render.h"
#include "BKE_font.h"
#include "BKE_vfont.h"
#include "DNA_curve_types.h"

2
source/blender/draw/intern/draw_cache_impl_curve.cc
View File

@ -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"

3
source/blender/draw/intern/draw_manager_profiling.c
View File

@ -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));

2
source/blender/editors/curve/editfont.c
View File

@ -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"

2
source/blender/editors/curve/editfont_undo.c
View File

@ -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"

2
source/blender/editors/object/object_add.c
View File

@ -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"

2
source/blender/editors/render/render_shading.c
View File

@ -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"

2
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -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"

2
source/blender/makesrna/intern/rna_ID.c
View File

@ -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"

2
source/blender/makesrna/intern/rna_curve.c
View File

@ -30,7 +30,7 @@
#include "BLT_translation.h"
#include "BKE_font.h"
#include "BKE_vfont.h"
#include "RNA_access.h"
#include "RNA_define.h"

2
source/blender/makesrna/intern/rna_main_api.c
View File

@ -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"

2
source/blender/makesrna/intern/rna_object_api.c
View File

@ -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"

2
source/blender/makesrna/intern/rna_vfont.c
View File

@ -30,7 +30,7 @@
#ifdef RNA_RUNTIME
# include "BKE_font.h"
# include "BKE_vfont.h"
# include "DNA_object_types.h"
# include "DEG_depsgraph.h"

2
source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
View File

@ -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"

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -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"

2
source/creator/creator.c
View File

@ -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"