From 56116bbdf434b57e4d74b1112b4b8111a7c8fa9a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 10 Feb 2020 12:58:59 +0100 Subject: Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`. Note that `BKE_library.h`/`library.c` were renamed to `BKE_lib_id.h`/`lib_id.c` to avoid having a too generic name here. Part of T72604. --- source/blender/makesrna/intern/makesrna.c | 2 +- source/blender/makesrna/intern/rna_ID.c | 8 ++++---- source/blender/makesrna/intern/rna_access_compare_override.c | 2 +- source/blender/makesrna/intern/rna_main_api.c | 2 +- source/blender/makesrna/intern/rna_rna.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 9b38ca8009c..2f5d9ae7a50 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -4309,7 +4309,7 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const fprintf(f, "#include \"BLI_utildefines.h\"\n\n"); fprintf(f, "#include \"BKE_context.h\"\n"); - fprintf(f, "#include \"BKE_library.h\"\n"); + fprintf(f, "#include \"BKE_lib_id.h\"\n"); fprintf(f, "#include \"BKE_main.h\"\n"); fprintf(f, "#include \"BKE_report.h\"\n"); diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 0b4ac400152..7de6b651900 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -29,7 +29,7 @@ #include "BLI_utildefines.h" #include "BKE_icons.h" -#include "BKE_library.h" +#include "BKE_lib_id.h" #include "BKE_object.h" #include "RNA_access.h" @@ -90,9 +90,9 @@ const EnumPropertyItem rna_enum_id_type_items[] = { # include "BKE_font.h" # include "BKE_idprop.h" -# include "BKE_library_query.h" -# include "BKE_library_override.h" -# include "BKE_library_remap.h" +# include "BKE_lib_query.h" +# include "BKE_lib_override.h" +# include "BKE_lib_remap.h" # include "BKE_animsys.h" # include "BKE_material.h" # include "BKE_global.h" /* XXX, remove me */ diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 7c9b4254e4d..9b2902b8f96 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -34,7 +34,7 @@ #endif #include "BKE_idprop.h" -#include "BKE_library_override.h" +#include "BKE_lib_override.h" #include "BKE_main.h" #include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 31e696534fe..bb851365997 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -54,7 +54,7 @@ # include "BKE_image.h" # include "BKE_light.h" # include "BKE_lattice.h" -# include "BKE_library_remap.h" +# include "BKE_lib_remap.h" # include "BKE_lightprobe.h" # include "BKE_linestyle.h" # include "BKE_mask.h" diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 4db702b215f..34ea9d3d03e 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -127,7 +127,7 @@ const EnumPropertyItem rna_enum_property_unit_items[] = { # include "BLI_ghash.h" # include "BLI_string.h" -# include "BKE_library_override.h" +# include "BKE_lib_override.h" /* Struct */ -- cgit v1.2.3