Brush Assets: Support adding shortcut to asset shelf items #117861

Hans Goudey · 2024-02-05T17:51:26+01:00

Hans Goudey commented

2024-02-05 17:51:26 +01:00

Don't use a keymap for the asset shelf to activate brushes; there's no
need to recreate basic UI interaction at this level. Instead use an
operator button so the ability to add a shortcut is automaticaly added
by other UI code.

Also change the operator to use an explicit asset reference instead of
the "context asset". This was already done for other operators that add
data-blocks from assets.

Don't use a keymap for the asset shelf to activate brushes; there's no need to recreate basic UI interaction at this level. Instead use an operator button so the ability to add a shortcut is automaticaly added by other UI code. Also change the operator to use an explicit asset reference instead of the "context asset". This was already done for other operators that add data-blocks from assets. --- ![image](/attachments/8182daaf-197e-44a9-bcd1-ba950d81d580)

image.png

26 KiB

🚀 2

Hans Goudey added 11 commits 2024-02-05 17:51:34 +01:00

55eb0815db Shortcut attempt

cb8bef3dae Merge branch 'brush-assets-project' into brush-assets-shortcut

ce575c4f6b Cleanup

0aeb823a05 Working except for active status

0da63eca67 Working

ef64b454c0 Merge branch 'brush-assets-project' into brush-assets-shortcut

eb02a851c9 Merge branch 'brush-assets-project' into brush-assets-shortcut

2df28428c4 Merge branch 'brush-assets-project' into brush-assets-shortcut

3d771509e9 Cleanup, fix

a4bc769278 Merge branch 'brush-assets-project' into brush-assets-shortcut

67d3cbc25d Add newline

Hans Goudey requested review from Julian Eisel 2024-02-05 17:51:54 +01:00

Hans Goudey added this to the Brush Assets & Asset Shelf project 2024-02-05 17:52:01 +01:00

Brecht Van Lommel reviewed 2024-02-05 19:05:25 +01:00

Brecht Van Lommel left a comment

Great, just one minor comment.

source/blender/editors/asset/intern/asset_shelf_asset_view.cc Outdated

						
				@ -214,0 +211,4 @@

				  const AssetShelfType &shelf_type = *asset_view.shelf_.type;

				  wmOperatorType *ot = WM_operatortype_find(shelf_type.activate_operator.c_str(), false);

				  PointerRNA op_props;

				  WM_operator_properties_create_ptr(&op_props, ot);

Brecht Van Lommel commented

2024-02-05 19:03:59 +01:00

This function does not check if ot is null (but WM_operator_properties_create does check).

This function does not check if `ot` is null (but `WM_operator_properties_create` does check).

HooglyBoogly marked this conversation as resolved

Julian Eisel reviewed 2024-02-07 11:19:33 +01:00

Julian Eisel left a comment

I think wit

source/blender/editors/include/UI_grid_view.hh

						
				@ -207,0 +208,4 @@

				  /**

				   * \note: Takes ownership of the operator properies defined in \a op_props.

				   */

				  void build_grid_tile_button(uiLayout &layout,

Julian Eisel commented

2024-02-07 11:17:33 +01:00

Would add default arguments for convenience, but also to simply communicate that these are optional.

HooglyBoogly marked this conversation as resolved

source/blender/editors/sculpt_paint/paint_ops.cc

						
				@ -1005,0 +998,4 @@

				  const asset_system::AssetRepresentation *asset =

				      asset::operator_asset_reference_props_get_asset_from_all_library(*C, *op->ptr, op->reports);

				  if (!asset) {

				    return OPERATOR_CANCELLED;