WIP: Brush Assets: Add initial support for the new 'brush asset' usage. #111659

Bastien Montagne · 2023-08-29T16:33:22+02:00

Bastien Montagne commented

2023-08-29 16:33:22 +02:00

This commit mainly adds the low-level logic to link and create a runtime
override for brushes.

The biggest changes are in setup_app_data (post-loading of .blend
file), to add support to move over some data from old bmain to newly
loaded bmain. The logic is complex, and different depending on whether
it is an undo (aka memfile read) step, or an actual .blend file reading:

On undo, we only port over brushes themselves, their dependencies are
not handled. However, since memfile reading code already ported over
linked IDs, these do not need to be swapped.
On real .blend file loading, brushes from the old bmain are being
reused, as long as they do not conflict (name/lib) with brushes from
the new bmain. Their dependencies are also re-used if needed.
Only exception: local assets from old bmain are never re-used.

There is also a new step added to the 'open file' process, which checks
if the to-be-opened file is a library of the currently opened one, and
if so, if there are local tweaked overrides of assets from the new file.
The option to save these tweaks in draft is currently an empty mockup,
but the rest is functional.

Brush now has a new AssetWeakReference pointer to keep track of the
last active brush asset, and restore it on fileread in case there is
currently no active brush asset for the given paint/sculpt mode.

Some parts of this commits are mockups/place-holders that are not
expected to be committed as-is, if at all:

Some initial support for an asset-shelf (using code from
brush-asset-project branch), very much WIP still.
Definition of test brush library with semi-hard-coded path.
There is also a drawing bug because the poll function of Brush
panels return false initially (tool has no data-block ref).
Very unclear what's hapening here.

NOTE: This branch is based on the brush-asset-project branch.

Ref. #101908.

This commit mainly adds the low-level logic to link and create a runtime override for brushes. The biggest changes are in `setup_app_data` (post-loading of .blend file), to add support to move over some data from old bmain to newly loaded bmain. The logic is complex, and different depending on whether it is an undo (aka memfile read) step, or an actual .blend file reading: * On undo, we only port over brushes themselves, their dependencies are not handled. However, since memfile reading code already ported over linked IDs, these do not need to be swapped. * On real .blend file loading, brushes from the old bmain are being reused, as long as they do not conflict (name/lib) with brushes from the new bmain. Their dependencies are also re-used if needed. Only exception: local assets from old bmain are never re-used. There is also a new step added to the 'open file' process, which checks if the to-be-opened file is a library of the currently opened one, and if so, if there are local tweaked overrides of assets from the new file. The option to save these tweaks in draft is currently an empty mockup, but the rest is functional. Brush now has a new `AssetWeakReference` pointer to keep track of the last active brush asset, and restore it on fileread in case there is currently no active brush asset for the given paint/sculpt mode. Some parts of this commits are mockups/place-holders that are not expected to be committed as-is, if at all: * Some initial support for an asset-shelf (using code from `brush-asset-project` branch), very much WIP still. * Definition of test brush library with semi-hard-coded path. * There is also a drawing bug because the poll function of Brush panels return false initially (tool has no data-block ref). Very unclear what's hapening here. NOTE: This branch is based on the `brush-asset-project` branch. Ref. #101908.

Bastien Montagne commented

2023-08-29 16:34:38 +02:00

@blender-bot package

Blender Bot commented

2023-08-29 16:34:41 +02:00

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR111659) when ready.

Bastien Montagne commented

2023-08-29 16:35:36 +02:00

@dfelinto @JulianEisel @JulienKaspar FYI, current status of Brush Asset branch rebased on current main.

Bastien Montagne force-pushed tmp-brush-assets from 51c7e1b06b to 7132788d6a

2023-08-30 16:05:53 +02:00

Compare

Bastien Montagne commented

2023-08-30 16:06:06 +02:00

@blender-bot package

Blender Bot commented

2023-08-30 16:06:10 +02:00

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR111659) when ready.

Bastien Montagne commented

2023-08-30 18:39:48 +02:00

@blender-bot package

Blender Bot commented

2023-08-30 18:39:50 +02:00

Package build started. Download here when ready.

Package build started. [Download here](https://builder.blender.org/download/patch/PR111659) when ready.

Bastien Montagne force-pushed tmp-brush-assets from 7132788d6a to ab0cf3e4a3

2023-09-08 14:36:50 +02:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from ab0cf3e4a3 to bd9fcd6d0b

2023-11-02 16:19:47 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from bd9fcd6d0b to 4477485f87

2023-11-06 10:26:50 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from 4477485f87 to aedeb2dd3a

2023-11-06 18:49:57 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from aedeb2dd3a to e3ef163816

2023-11-09 12:07:03 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from e3ef163816 to fe9e7eab13

2023-11-23 11:30:55 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from fe9e7eab13 to b3964b1b0d

2023-11-24 10:41:34 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from b3964b1b0d to 30e81d1100

2023-11-24 15:24:23 +01:00

Compare

Bastien Montagne force-pushed tmp-brush-assets from 30e81d1100 to eb505ad1c7

2023-11-24 15:31:57 +01:00

Compare

Bastien Montagne closed this pull request

2024-01-09 16:42:06 +01:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

WIP: Brush Assets: Add initial support for the new 'brush asset' usage. #111659

Pull request closed