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 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63484e0e96 - Show all commits

2
source/creator/CMakeLists.txt
View File

@ -1678,7 +1678,7 @@ if(EXISTS "${ASSET_BUNDLE_DIR}")
)
# TODO temporary change for development only. Remove before merging.
set(ASSET_BRUSH_BUNDLE_DIR "${ASSET_BUNDLE_DIR}/../working/brushes/")
set(ASSET_BRUSH_BUNDLE_DIR "${ASSET_BUNDLE_DIR}/../testing/brushes/")
if(EXISTS "${ASSET_BRUSH_BUNDLE_DIR}")
install(
FILES ${ASSET_BRUSH_BUNDLE_DIR}/essentials_brushes.blend