Fix: crash when selecting a brush asset from the wrong mode #117233
No reviewers
Labels
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: blender/blender#117233
Loading…
Reference in New Issue
No description provided.
Delete Branch "brecht/blender:brush-asset-fix-mode-crash"
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?
Ideally these should not appear at all in the asset shelf, but it's not
obvious that will 100% ensure the right mode.
Also fix a missing redraw of the properties editor when switching
brushes.
I don't know if we are going to want to do PRs for every simple thing like this, but just to get something started.
Even if we do the filtering everywhere, it doesn't stop someone from calling the operator with an invalid asset. So it seems reasonable to protect from that here.
@ -694,2 +694,3 @@
void BKE_paint_brush_asset_set(Paint *p, Brush *br, AssetWeakReference *weak_asset_reference)
bool BKE_paint_brush_asset_set(Paint *p, Brush *br, AssetWeakReference *weak_asset_reference)
{
/* TODO: does this need to be ensure at some higher level? Assets should be tagged
ensure
->ensured
@ -1179,6 +1179,8 @@ static int brush_asset_select_exec(bContext *C, wmOperator * /*op*/)
/* Either takes ownership of the brush_asset_reference, or frees it. */
BKE_paint_brush_asset_set(&tool_settings->curves_sculpt->paint, brush, brush_asset_reference);
I guess this should check the return argument and return
OPERATOR_CANCELLED
and give an errorIt's not a no-op right now, because the brush did get added to the main database. Just not actually selected for painting.
I can try to do the mode check somewhere inside
BKE_brush_asset_runtime_ensure
to really make it a no-op. It doesn't make a lot of difference in practice since this operator doesn't haveOPTYPE_UNDO
orOPTYPE_REGISTER
, but still more elegant.Ah, good point. Maybe just a
RPT_WARNING
thenSomething must have gone wrong with a merge or rebase? There are many unrelated changes in the diff currently...
Force of habit, should have merged brush-assets-project instead of main.
Makes sense to me too.