blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

GPencil: New support for Asset Manager #104413

Closed
Antonio Vazquez wants to merge 10 commits from antoniov/blender:temp-asset-lite into main
pull from: antoniov/blender:temp-asset-lite
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 4 Commits 10 Files Changed 13 +19 -24
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce2bb90e2d - Show all commits

43
source/blender/editors/gpencil/gpencil_asset.cc
View File

@ -287,7 +287,7 @@ static bool gpencil_asset_create(const bContext *C,
}
/* Nothing to export. */
if (!do_export) {
BKE_report(op->reports, RPT_ERROR, "No strokes were found to create the asset.");
BKE_report(op->reports, RPT_ERROR, "No strokes were found to create the asset");
return false;
}
@ -389,7 +389,7 @@ static int gpencil_asset_create_exec(bContext *C, wmOperator *op)
BKE_report(op->reports,
RPT_WARNING,
"Object has layer parenting, masking, modifiers or effects not supported in this "
"asset type. These features have been omitted in the asset.");
"asset type. These features have been omitted in the asset");
}
WM_main_add_notifier(NC_ID | NA_EDITED, nullptr);
@ -400,49 +400,49 @@ static int gpencil_asset_create_exec(bContext *C, wmOperator *op)
void GPENCIL_OT_asset_create(wmOperatorType *ot)
{
static const EnumPropertyItem mode_types[] = {
static const EnumPropertyItem source_types[] = {
JulianEisel marked this conversation as resolved
Julian Eisel commented 2023-02-14 13:00:04 +01:00
Review
Copy Link

sources?

`sources`?
{GP_ASSET_SOURCE_ACTIVE_LAYER,
"LAYER",
0,
"Active Layer",
"Copy the strokes of the active layer into a new grease pencil asset."},
"Create an asset using strokes of the active layer"},
JulianEisel marked this conversation as resolved
Julian Eisel commented 2023-02-14 13:00:20 +01:00
Review
Copy Link

None of the descriptions should end with a period.

None of the descriptions should end with a period.
{GP_ASSET_SOURCE_ALL_LAYERS,
"LAYERS_ALL",
0,
"All Layers",
"Copy the strokes of all layers into a new grease pencil asset."},
"Create an asset using strokes from all layers"},
{GP_ASSET_SOURCE_ALL_LAYERS_SPLIT,
"LAYERS_SPLIT",
0,
"All Layers Separated",
"Create an asset by layer."},
"Create multiple grease pencil assets, one for each layer"},
JulianEisel marked this conversation as resolved
Julian Eisel commented 2023-02-14 12:59:17 +01:00
Review
Copy Link

This description isn't clear to me. Does this create one asset for each layer? In that case I suggest: "Create multiple grease pencil assets, one for each layer"

This description isn't clear to me. Does this create one asset for each layer? In that case I suggest: "Create multiple grease pencil assets, one for each layer"
RNA_ENUM_ITEM_SEPR,
{GP_ASSET_SOURCE_ACTIVE_KEYFRAME,
"KEYFRAME",
0,
"Active Keyframe (Active Layer)",
"Create asset using active keyframe for active layer"},
"Create an asset using active keyframe for active layer"},
Julian Eisel commented 2023-02-14 12:56:31 +01:00
Review
Copy Link

This and the following descriptions should read "Create an asset...".

In fact this and the following descriptions aren't clear to me either, they just repeat the operator name and the enum item name. I like what you did above, it actually explains what it's doing, like:
"Copy the strokes of [something something] into a new grease pencil asset".

This and the following descriptions should read "Create ***an*** asset...". In fact this and the following descriptions aren't clear to me either, they just repeat the operator name and the enum item name. I like what you did above, it actually explains what it's doing, like: *"Copy the strokes of [something something] into a new grease pencil asset"*.
{GP_ASSET_SOURCE_ACTIVE_KEYFRAME_ALL_LAYERS,
"KEYFRAME_ALL",
0,
"Active Keyframe (All Layers)",
"Create asset using active keyframe for all layers"},
"Create an asset using active keyframe for all layers"},
{GP_ASSET_SOURCE_SELECTED_KEYFRAMES,
"KEYFRAME_SELECTED",
0,
"Selected Keyframes",
"Create asset using selected keyframes"},
"Create an asset using selected keyframes"},
RNA_ENUM_ITEM_SEPR,
{GP_ASSET_SOURCE_SELECTED_STROKES,
"SELECTED",
0,
"Selected Strokes",
"Create asset using all selected strokes"},
"Create an asset using all selected strokes"},
{GP_ASSET_SOURCE_SELECTED_POINTS,
"POINT",
0,
"Selected Points",
"Create asset using all selected points"},
"Create an asset using all selected points"},
{0, nullptr, 0, nullptr, nullptr},
};
@ -461,7 +461,7 @@ void GPENCIL_OT_asset_create(wmOperatorType *ot)
/* properties */
ot->prop = RNA_def_enum(
ot->srna, "source", mode_types, GP_ASSET_SOURCE_SELECTED_STROKES, "Create From", "");
ot->srna, "source", source_types, GP_ASSET_SOURCE_SELECTED_STROKES, "Create From", "");
RNA_def_boolean(ot->srna,
"reset_origin",
true,
@ -741,21 +741,14 @@ static tGPDasset *gpencil_session_init_asset_import(bContext *C, wmOperator *op)
/* Asset GP data block. */
tgpa->gpd_asset = (bGPdata *)id;
tgpa->asset_strokes.clear();
return tgpa;
Julian Eisel commented 2023-02-14 13:17:16 +01:00
Review
Copy Link

Shouldn't be needed, the vector is default constructed cleanly.

Shouldn't be needed, the vector is default constructed cleanly.
}
/* Init: Allocate memory and set init values */
static bool gpencil_asset_import_init(bContext *C, wmOperator *op)
{
tGPDasset *tgpa;
/* check context */
op->customdata = tgpa = static_cast<tGPDasset *>(gpencil_session_init_asset_import(C, op));
op->customdata = tgpa;
if (tgpa == nullptr) {
/* something wasn't set correctly in context */
op->customdata = static_cast<tGPDasset *>(gpencil_session_init_asset_import(C, op));
if (op->customdata == nullptr) {
gpencil_asset_import_exit(C, op);
return false;
}
@ -772,7 +765,7 @@ static int gpencil_asset_import_invoke(bContext *C, wmOperator *op, const wmEven
/* Try to initialize context data needed. */
if (!gpencil_asset_import_init(C, op)) {
if (op->customdata) {
MEM_delete(op->customdata);
MEM_delete(static_cast<tGPDasset *>(op->customdata));
}
return OPERATOR_CANCELLED;
}
@ -785,7 +778,8 @@ static int gpencil_asset_import_invoke(bContext *C, wmOperator *op, const wmEven
/* Load of the strokes in the target data block. */
if (!gpencil_asset_append_strokes(tgpa)) {
gpencil_asset_import_exit(C, op);
return OPERATOR_CANCELLED;
BKE_report(op->reports, RPT_WARNING, "No strokes to append");
return OPERATOR_FINISHED;
}
/* Select imported strokes. */
@ -804,7 +798,7 @@ void GPENCIL_OT_asset_import(wmOperatorType *ot)
/* identifiers */
ot->name = "Grease Pencil Import Asset";
ot->idname = "GPENCIL_OT_asset_import";
ot->description = "Import Asset into existing grease pencil object";
ot->description = "Add strokes from a grease pencil asset to an existing grease pencil object";
/* callbacks */
ot->invoke = gpencil_asset_import_invoke;
@ -817,5 +811,6 @@ void GPENCIL_OT_asset_import(wmOperatorType *ot)
WM_operator_properties_id_lookup(ot, true);
PropertyRNA *prop = RNA_def_enum(ot->srna, "type", rna_enum_id_type_items, 0, "Type", "");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ID);
RNA_def_property_flag(prop, static_cast<PropertyFlag>(PROP_SKIP_SAVE | PROP_HIDDEN));
}
/** \} */