blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 351 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

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

2
source/blender/blenkernel/BKE_brush.hh
View File

@ -14,6 +14,7 @@
#include "DNA_object_enums.h"
enum class PaintMode : int8_t;
struct AssetWeakReference;
struct Brush;
struct ImBuf;
struct ImagePool;
@ -30,6 +31,7 @@ struct UnifiedPaintSettings;
void BKE_brush_system_init();
void BKE_brush_system_exit();
/* TODO: Should be somewhere else not specific to brushes. */
Brush *BKE_brush_asset_runtime_ensure(Main *bmain,
const AssetWeakReference *brush_asset_reference);

2
source/blender/blenkernel/intern/brush.cc
View File

@ -44,7 +44,7 @@
#include "BKE_preview_image.hh"
#include "BKE_texture.h"
#include "AS_asset_library.h"
#include "AS_asset_library.hh"
#include "IMB_colormanagement.hh"
#include "IMB_imbuf.hh"