blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 381 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 8 Commits 381 Files Changed 86 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2120714afe - Show all commits

4
source/blender/blenkernel/BKE_lib_override.hh
View File

@ -23,6 +23,8 @@
* of IDs in a given Main data-base. * of IDs in a given Main data-base.
*/ */
#include "DNA_ID_enums.h"
#include <optional> #include <optional>
struct BlendFileReadReport; struct BlendFileReadReport;
@ -89,7 +91,7 @@ bool BKE_lib_override_library_is_system_defined(const Main *bmain, const ID *id)
* \param r_reports: If not NULL, add one report for each relevant ID. * \param r_reports: If not NULL, add one report for each relevant ID.
*/ */
int BKE_lib_override_user_edited_from_library_count(Main *bmain, int BKE_lib_override_user_edited_from_library_count(Main *bmain,
const short id_type, ID_Type id_type,
Library *library, Library *library,
ReportList *r_reports); ReportList *r_reports);

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

@ -340,7 +340,7 @@ bool BKE_lib_override_library_is_system_defined(const Main *bmain, const ID *id)
} }
int BKE_lib_override_user_edited_from_library_count(Main *bmain, int BKE_lib_override_user_edited_from_library_count(Main *bmain,
const short id_type, const ID_Type id_type,
Library *library, Library *library,
ReportList *r_reports) ReportList *r_reports)
{ {