blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 773 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

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

3
source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
View File

@ -27,9 +27,6 @@
#include "asset_shelf.hh"
using namespace blender;
using namespace blender::ed::asset;
namespace blender::ed::asset::shelf {
JulianEisel marked this conversation as resolved
Hans Goudey commented 2023-06-06 19:28:52 +02:00
Review
Copy Link

These using statements shouldn't be necessary, looks like the whole file is in that namespace.

These `using` statements shouldn't be necessary, looks like the whole file is in that namespace.
class AssetCatalogSelectorTree : public ui::AbstractTreeView {

2
source/blender/editors/interface/interface_ops.cc
View File

@ -2343,7 +2343,7 @@ static void UI_OT_list_start_filter(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
/** \name UI View Drop Operator
/** \name UI View Start Filter Operator
* \{ */
static int ui_view_start_filter_invoke(bContext *C, wmOperator *op, const wmEvent *event)