[Bf-blender-cvs] [723c76e5d47] asset-browser: Remove preview pointer in asset-data
Julian Eisel
noreply at git.blender.org
Mon Nov 30 17:42:37 CET 2020
Commit: 723c76e5d47f838fd4a24cdee93a66ed3db93166
Author: Julian Eisel
Date: Mon Nov 30 15:30:48 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB723c76e5d47f838fd4a24cdee93a66ed3db93166
Remove preview pointer in asset-data
Not needed, we get the preview via the ID.
===================================================================
M source/blender/blenkernel/intern/asset.c
M source/blender/editors/asset/asset_edit.c
M source/blender/makesdna/DNA_asset_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/asset.c b/source/blender/blenkernel/intern/asset.c
index 1780439bbfd..aa28651399c 100644
--- a/source/blender/blenkernel/intern/asset.c
+++ b/source/blender/blenkernel/intern/asset.c
@@ -190,5 +190,4 @@ void BKE_assetdata_read(BlendDataReader *reader, AssetData *asset_data)
BLO_read_data_address(reader, &asset_data->description);
BLO_read_list(reader, &asset_data->tags);
- asset_data->preview = NULL;
}
diff --git a/source/blender/editors/asset/asset_edit.c b/source/blender/editors/asset/asset_edit.c
index c52e8bc7062..318a980bcbd 100644
--- a/source/blender/editors/asset/asset_edit.c
+++ b/source/blender/editors/asset/asset_edit.c
@@ -45,9 +45,6 @@ bool ED_asset_make_for_id(const bContext *C, ID *id)
id->asset_data = BKE_asset_data_create();
UI_icon_render_id(C, NULL, id, true, true);
- /* Store reference to the ID's preview. */
- /* XXX get rid of this? File read will be a hassle and no real need for it right now. */
- id->asset_data->preview = BKE_assetdata_preview_get_from_id(id->asset_data, id);
return true;
}
diff --git a/source/blender/makesdna/DNA_asset_types.h b/source/blender/makesdna/DNA_asset_types.h
index 610b78984cc..4ae5f5f07aa 100644
--- a/source/blender/makesdna/DNA_asset_types.h
+++ b/source/blender/makesdna/DNA_asset_types.h
@@ -56,9 +56,6 @@ extern AssetRepositoryInfo *G_asset_repository_info;
* more than that from the file. So pointers to other IDs or ID data are strictly forbidden.
*/
typedef struct AssetData {
- /** Thumbnail image of the data-block. Duplicate of the referenced ID preview. */
- struct PreviewImage *preview;
-
/** Custom asset meta-data. Cannot store pointers to IDs (#STRUCT_NO_DATABLOCK_IDPROPERTIES)! */
struct IDProperty *properties;
More information about the Bf-blender-cvs
mailing list