Remove all old brush icons, fixes error when shown in menu #123842

Closed
Julian Eisel wants to merge 3 commits from JulianEisel/blender:temp-brush-tool-icon-remove into brush-assets-project

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Member

5695298832 removed code initializing the icons, so they weren't usable, just their ICON_ enumerator still existed. Remove the icons properly.

This could affect add-ons using any of these icons, but they should just receive a NONE icon now.

Fixes empty brush tool icons:

Would also print errors when opening the menu, like:
ERROR (bke.icons): source/blender/blenkernel/intern/icons.cc:410 BKE_icon_get: no icon for icon ID: 797

5695298832 removed code initializing the icons, so they weren't usable, just their `ICON_` enumerator still existed. Remove the icons properly. This could affect add-ons using any of these icons, but they should just receive a `NONE` icon now. Fixes empty brush tool icons: <img src="https://projects.blender.org/attachments/cd035818-c52c-4cde-abfa-4532f9e6be2c" width="400px"> Would also print errors when opening the menu, like: `ERROR (bke.icons): source/blender/blenkernel/intern/icons.cc:410 BKE_icon_get: no icon for icon ID: 797`
Julian Eisel added 1 commit 2024-06-27 15:18:12 +02:00
Member

I didn't do this in the branch already because I was trying to remove noisy changes from it, but if it fixes something, +1

I didn't do this in the branch already because I was trying to remove noisy changes from it, but if it fixes something, +1
Julian Eisel added 1 commit 2024-06-27 15:31:04 +02:00
Julian Eisel added 1 commit 2024-06-27 15:32:16 +02:00
Forgot these
Some checks failed
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-coordinator Build done.
0fd4218e37
Author
Member

I think I will indeed only include the changes to remove the icons from RNA for the initial brush assets commit, then remove everything else for them in followups.

I'd just like to get the complete removal of these icons approved.

I think I will indeed only include the changes to remove the icons from RNA for the initial brush assets commit, then remove everything else for them in followups. I'd just like to get the complete removal of these icons approved.
Julian Eisel requested review from Hans Goudey 2024-06-27 15:35:27 +02:00
Julian Eisel requested review from Brecht Van Lommel 2024-06-27 15:35:35 +02:00
Julian Eisel changed title from Remove old brush tool icons, fixes error when shown in menu to Remove all old brush icons, fixes error when shown in menu 2024-06-27 15:36:29 +02:00
Brecht Van Lommel approved these changes 2024-06-27 15:39:37 +02:00
Member

This PR is a bit confusing then, since the merge target branch is the brush assets branch and all the icons are removed here. Maybe you could just commit the RNA removal to the brush assets branch and leave this one for removing the icon files and other stuff from main?

This PR is a bit confusing then, since the merge target branch is the brush assets branch and all the icons are removed here. Maybe you could just commit the RNA removal to the brush assets branch and leave this one for removing the icon files and other stuff from main?
Author
Member

Will commit the RNA part to the branch then, and prepare the complete icon removal separately. I see the buildbots are also unhappy (at least on a clean build), so need to investigate.

Didn't do a combined PR without reason, but not worth discussing.

Will commit the RNA part to the branch then, and prepare the complete icon removal separately. I see the buildbots are also unhappy (at least on a clean build), so need to investigate. Didn't do a combined PR without reason, but not worth discussing.
Author
Member

Committed the RNA changes in 2af0c90b46. Added a note in #116337 to remove the icons properly under Tasks for after the merge.

Committed the RNA changes in 2af0c90b46. Added a note in #116337 to remove the icons properly under _Tasks for after the merge_.
Julian Eisel closed this pull request 2024-06-27 15:52:54 +02:00
Some checks failed
buildbot/vexp-code-patch-darwin-arm64 Build done.
buildbot/vexp-code-patch-darwin-x86_64 Build done.
buildbot/vexp-code-patch-windows-amd64 Build done.
buildbot/vexp-code-patch-linux-x86_64 Build done.
buildbot/vexp-code-patch-lint Build done.
buildbot/vexp-code-patch-coordinator Build done.

Pull request closed

Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Code Documentation
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
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
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
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
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
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
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
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#123842
No description provided.