Fix #108303: Added missing Auto-Masking label #108494

Closed
Sam Cantwell wants to merge 1 commits from Sam-Cantwell/blender:sculpt-ui-fix into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
First-time contributor

The Auto-Masking label in the brush settings of
sculpt mode was missing. Added the label back.

It seems like the heading disappeared after commit db40b62252 which aimed to change a different drop down menu for Auto-Masking.
My testing showed that the edited part of the script in this commit was only ever run when the brush settings were opened so it shouldn't change how the other drop down menu appears.

The Auto-Masking label in the brush settings of sculpt mode was missing. Added the label back. It seems like the heading disappeared after commit db40b62252 which aimed to change a different drop down menu for Auto-Masking. My testing showed that the edited part of the script in this commit was only ever run when the brush settings were opened so it shouldn't change how the other drop down menu appears.
Sam Cantwell added 1 commit 2023-06-01 08:43:49 +02:00
06c625fa48 Fix #108303: Added missing Auto-Masking label
The Auto-Masking label in the brush settings of
sculpt mode was missing. Added the label back.
Sam Cantwell requested review from Julian Eisel 2023-06-01 08:46:37 +02:00
Iliya Katushenock added this to the User Interface project 2023-06-01 09:50:31 +02:00
Pratik Borhade approved these changes 2023-06-06 12:03:02 +02:00
Pratik Borhade left a comment
Member

Hi, thanks for the PR. Looks correct to me.

Hi, thanks for the PR. Looks correct to me.
Pratik Borhade requested review from Pablo Vazquez 2023-06-06 12:06:22 +02:00
Member

Not sure how to rebase someone else's PR.
Could you rebase your PR to blender-v3.6-release branch: https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request

Not sure how to rebase someone else's PR. Could you rebase your PR to blender-v3.6-release branch: https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request
Pablo Vazquez approved these changes 2023-06-06 12:11:40 +02:00
Pablo Vazquez left a comment
Member

Oops it was my bad. This should go in 3.6 as well. Thanks for the fix!

Oops it was my bad. This should go in 3.6 as well. Thanks for the fix!
Pablo Vazquez removed review request for Julian Eisel 2023-06-06 12:11:46 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking label 2023-06-07 01:00:46 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking Label 2023-06-07 01:02:52 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking label 2023-06-07 01:02:53 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking Label 2023-06-07 01:03:17 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking Label to Fix #108303: Added missing Auto-Masking label 2023-06-07 01:03:47 +02:00
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking label 2023-06-07 01:06:17 +02:00
Harley changed target branch from main to blender-v3.6-release 2023-06-07 01:07:19 +02:00
Member

I'll commit this by hand (with Sam as Author) to both 3.6 and 4.0 branches tomorrow (in about 12 hours).

I'll commit this by hand (with Sam as Author) to both 3.6 and 4.0 branches tomorrow (in about 12 hours).
Member

Something went wrong here with the rebase I think? Rebasing onto the release branch should be done like explained in the Wiki: https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request

Something went wrong here with the rebase I think? Rebasing onto the release branch should be done like explained in the Wiki: https://wiki.blender.org/wiki/Tools/Pull_Requests#Rebasing_a_Pull_Request
Harley Acheson changed title from Fix #108303: Added missing Auto-Masking label to Fix #108303: Added missing Auto-Masking label 2023-06-07 16:57:22 +02:00
Harley changed target branch from blender-v3.6-release to main 2023-06-07 16:57:24 +02:00
Member

Pushed to 3.6 and 4.0
2a7739f9d3

Pushed to 3.6 and 4.0 https://projects.blender.org/blender/blender/commit/2a7739f9d3984922cc168238423bb91128dda863
Harley Acheson closed this pull request 2023-06-07 17:29:49 +02:00

Pull request closed

Sign in to join this conversation.
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
5 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#108494
No description provided.