blender/blender-assets
0
1
Fork 4
Code Pull Requests 1 Activity

Cleanup: Add note about updating default enabled catalogs #12

Open
Sean Kim wants to merge 1 commits from Sean-Kim/blender-assets:default-enabled-blendfile into main
pull from: Sean-Kim/blender-assets:default-enabled-blendfile
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 1 +4
Sean Kim commented 2024-10-24 22:24:12 +02:00
Member
Copy Link
No description provided.
Sean Kim added 1 commit 2024-10-24 22:24:13 +02:00
Sean Kim commented 2024-10-24 22:25:07 +02:00
Author
Member
Copy Link

Don't know if there's a better place for this than inside the .cats.txt file, but I figure this is probably worth documenting somewhere.

Don't know if there's a better place for this than inside the `.cats.txt` file, but I figure this is probably worth documenting somewhere.
Sean Kim requested review from Julien Kaspar 2024-10-24 22:25:26 +02:00
Julien Kaspar commented 2024-10-29 10:36:04 +01:00
Member
Copy Link

Since the cats.txt file is automatically created and updated by Blender I don't think it's obvious to look for important info in there.
Maybe instead add a README.txt file to the folder?

Since the cats.txt file is automatically created and updated by Blender I don't think it's obvious to look for important info in there. Maybe instead add a README.txt file to the folder?
Sean Kim commented 2024-11-01 19:33:05 +01:00
Author
Member
Copy Link

Ah, good point, the data would also likely get wiped away by Blender. I'll move it to a README.md either in the root of the repo or in the publish folder alongside the brush blend files.

Ah, good point, the data would also likely get wiped away by Blender. I'll move it to a README.md either in the root of the repo or in the publish folder alongside the brush blend files.
Merge conflict checking is in progress. Try again in few moments.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u default-enabled-blendfile:Sean-Kim-default-enabled-blendfile
git checkout Sean-Kim-default-enabled-blendfile
Sign in to join this conversation.
Reviewers
No reviewers
Julien Kaspar
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender-assets#12
No description provided.
Delete Branch "Sean-Kim/blender-assets:default-enabled-blendfile"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?