blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 358 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 358 Files Changed 123 -6
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 068c2e0dda - Show all commits

6
source/creator/CMakeLists.txt
View File

@ -1714,12 +1714,6 @@ if(EXISTS "${ASSET_BUNDLE_TESTING_DIR}")
set(ASSET_BUNDLE_DIR "${ASSET_BUNDLE_TESTING_DIR}")
endif()
# TODO temporary change for development only. Remove before merging.
set(ASSET_BUNDLE_TESTING_DIR "${ASSET_BUNDLE_DIR}/../testing/")
if(EXISTS "${ASSET_BUNDLE_TESTING_DIR}")
set(ASSET_BUNDLE_DIR "${ASSET_BUNDLE_TESTING_DIR}")
endif()
if(EXISTS "${ASSET_BUNDLE_DIR}")
install(
DIRECTORY ${ASSET_BUNDLE_DIR}