tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: Library: Move to IDTypeInfo, and remove unused BKE API.

This commit is contained in:
Bastien Montagne 2020-03-06 11:27:29 +01:00
parent c25f6e998b
commit 17e1fef85a
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_idtype.h
View File

@ -125,6 +125,7 @@ typedef struct IDTypeInfo {
/* Those are defined in the respective BKE files. */
extern IDTypeInfo IDType_ID_SCE;
extern IDTypeInfo IDType_ID_LI;
extern IDTypeInfo IDType_ID_OB;
/* ********** Helpers/Utils API. ********** */

2
source/blender/blenkernel/BKE_library.h
View File

@ -34,8 +34,6 @@ extern "C" {
struct Library;
struct Main;
void BKE_library_free(struct Library *lib);
void BKE_library_filepath_set(struct Main *bmain, struct Library *lib, const char *filepath);
#ifdef __cplusplus

1
source/blender/blenkernel/intern/idtype.c
View File

@ -52,6 +52,7 @@ static void id_type_init(void)
(void)0
INIT_TYPE(ID_SCE);
INIT_TYPE(ID_LI);
INIT_TYPE(ID_OB);
#undef INIT_TYPE

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

@ -140,7 +140,7 @@ void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag))
BLI_assert(0);
break;
case ID_LI:
BKE_library_free((Library *)id);
BLI_assert(0);
break;
case ID_OB:
BLI_assert(0);

26
source/blender/blenkernel/intern/library.c
View File

@ -34,6 +34,9 @@
#include "BLI_blenlib.h"
#include "BLT_translation.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_library.h"
#include "BKE_main.h"
@ -42,13 +45,30 @@
/* Unused currently. */
// static CLG_LogRef LOG = {.identifier = "bke.library"};
void BKE_library_free(Library *lib)
static void library_free_data(ID *id)
{
if (lib->packedfile) {
BKE_packedfile_free(lib->packedfile);
Library *library = (Library *)id;
if (library->packedfile) {
BKE_packedfile_free(library->packedfile);
}
}
IDTypeInfo IDType_ID_LI = {
.id_code = ID_LI,
.id_filter = 0,
.main_listbase_index = INDEX_ID_LI,
.struct_size = sizeof(Library),
.name = "Library",
.name_plural = "libraries",
.translation_context = BLT_I18NCONTEXT_ID_LIBRARY,
.flags = IDTYPE_FLAGS_NO_COPY | IDTYPE_FLAGS_NO_LIBLINKING | IDTYPE_FLAGS_NO_MAKELOCAL,
.init_data = NULL,
.copy_data = NULL,
.free_data = library_free_data,
.make_local = NULL,
};
void BKE_library_filepath_set(Main *bmain, Library *lib, const char *filepath)
{
/* in some cases this is used to update the absolute path from the