Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/asset.c7
-rw-r--r--source/blender/blenkernel/intern/icons.c3
-rw-r--r--source/blender/blenkernel/intern/lib_query.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/asset.c b/source/blender/blenkernel/intern/asset.c
index 6e358b55d6d..d2208dc9acb 100644
--- a/source/blender/blenkernel/intern/asset.c
+++ b/source/blender/blenkernel/intern/asset.c
@@ -20,7 +20,10 @@
#include <string.h>
+#include "BLI_utildefines.h"
+
#include "BKE_asset.h"
+#include "BKE_icons.h"
#include "BKE_idtype.h"
#include "BKE_lib_query.h"
@@ -43,7 +46,9 @@ static void asset_init_data(ID *id)
static void asset_free_data(ID *id)
{
Asset *asset = (Asset *)id;
- UNUSED_VARS(asset);
+
+ BKE_icon_id_delete((ID *)asset);
+ BKE_previewimg_free(&asset->preview);
}
static void asset_foreach_id(ID *id, LibraryForeachIDData *data)
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index 6da48195aab..2090a41453d 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -29,6 +29,7 @@
#include "MEM_guardedalloc.h"
+#include "DNA_asset_types.h"
#include "DNA_brush_types.h"
#include "DNA_collection_types.h"
#include "DNA_gpencil_types.h"
@@ -339,6 +340,8 @@ PreviewImage **BKE_previewimg_id_get_p(const ID *id)
ID_PRV_CASE(ID_GR, Collection);
ID_PRV_CASE(ID_SCE, Scene);
ID_PRV_CASE(ID_SCR, bScreen);
+ ID_PRV_CASE(ID_AST, Asset);
+
#undef ID_PRV_CASE
default:
break;
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 9fe6689848b..a2e290cf336 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -340,7 +340,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
case ID_LI:
return ELEM(id_type_used, ID_LI);
case ID_AST:
- return ELEM(id_type_used, ID_AST);
+ return true;
case ID_SCE:
return (ELEM(id_type_used,
ID_OB,