blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 352 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 352 Files Changed 124 +16 -1
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c65b0ad144 - Show all commits

17
source/creator/CMakeLists.txt
View File

@ -1669,12 +1669,27 @@ if(NOT EXISTS "${ASSET_BUNDLE_DIR}")
set(ASSET_BUNDLE_DIR ${CMAKE_SOURCE_DIR}/../lib/assets/publish/)
endif()
set(ASSET_TARGETDIR ${TARGETDIR_VER}/datafiles/assets)
if(EXISTS "${ASSET_BUNDLE_DIR}")
install(
DIRECTORY ${ASSET_BUNDLE_DIR}
DESTINATION ${TARGETDIR_VER}/datafiles/assets
DESTINATION ${ASSET_TARGETDIR}
PATTERN ".svn" EXCLUDE
)
# TODO temporary change for development only. Remove before merging.
set(ASSET_BRUSH_BUNDLE_DIR "${ASSET_BUNDLE_DIR}/../working/brushes/")
if(EXISTS "${ASSET_BRUSH_BUNDLE_DIR}")
install(
FILES ${ASSET_BRUSH_BUNDLE_DIR}/essentials_brushes.blend
DESTINATION ${ASSET_TARGETDIR}/brushes
)
install(
FILES ${ASSET_BRUSH_BUNDLE_DIR}/blender_assets.cats.txt
DESTINATION ${ASSET_TARGETDIR}
)
endif()
endif()