Commit: 2e37ed5940029c48d438c3d7e4b7fad6c8a16000
Author: Antonio Vazquez
Date: Tue Oct 26 17:23:59 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rB2e37ed5940029c48d438c3d7e4b7fad6c8a16000
GPencil: Fix problems after merge
Some functions have changed and the icons was not displayed as expected.
===================================================================
M source/blender/blenkernel/intern/icons.cc
M source/blender/editors/gpencil/gpencil_asset.c
===================================================================
diff --git a/source/blender/blenkernel/intern/icons.cc
b/source/blender/blenkernel/intern/icons.cc
index 7a970fc9bb6..41a282103cf 100644
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@ -379,6 +379,7 @@ PreviewImage **BKE_previewimg_id_get_p(const ID *id)
ID_PRV_CASE(ID_LA, Light);
ID_PRV_CASE(ID_IM, Image);
ID_PRV_CASE(ID_BR, Brush);
+ ID_PRV_CASE(ID_GD, bGPdata);
ID_PRV_CASE(ID_GR, Collection);
ID_PRV_CASE(ID_SCE, Scene);
ID_PRV_CASE(ID_SCR, bScreen);
diff --git a/source/blender/editors/gpencil/gpencil_asset.c
b/source/blender/editors/gpencil/gpencil_asset.c
index f3a946d5803..7074011e33a 100644
--- a/source/blender/editors/gpencil/gpencil_asset.c
+++ b/source/blender/editors/gpencil/gpencil_asset.c
@@ -360,8 +360,8 @@ static bool gpencil_asset_create(const bContext *C,
BKE_gpencil_frame_min_max(gpd, &f_min, &f_max);
/* Mark as asset. */
- if (ED_asset_mark_id(C, &gpd->id)) {
-
+ if (ED_asset_mark_id(&gpd->id)) {
+ ED_asset_generate_preview(C, &gpd->id);
/* Retime frame number to start by 1. Must be done after generate the
render preview. */
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
@@ -1425,7 +1425,6 @@ static void gpencil_asset_import_cancel(bContext *C,
wmOperator *op)
gpencil_asset_import_exit(C, op);
}
-
static bool gpencil_asset_import_poll(bContext *C)
{
return gpencil_asset_generic_poll(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
