blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 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 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eedd55e770 - Show all commits

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

@ -88,10 +88,10 @@ 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.
*/
int BKE_lib_override_user_edited_from_library_count(struct Main *bmain,
int BKE_lib_override_user_edited_from_library_count(Main *bmain,
const short id_type,
struct Library *library,
struct ReportList *r_reports);
Library *library,
ReportList *r_reports);
/**
* Check if given Override Property for given ID is animated (through a F-Curve in an Action, or