Fix #107918: Weight Gradient tool paints over locked vertex groups #108974

Manually merged
Sybren A. Stüvel merged 4 commits from PratikPB2123/blender:107918-gradient-lock-vgroup into main 2023-07-27 11:32:38 +02:00
Member

Exit the operator code if DG_LOCK_WEIGHT flag is set for active vertex
group to avoid painting over locked vertex group.
New function BKE_object_defgroup_active_is_locked created to handle this.

Exit the operator code if `DG_LOCK_WEIGHT` flag is set for active vertex group to avoid painting over locked vertex group. New function `BKE_object_defgroup_active_is_locked` created to handle this.
Pratik Borhade added 1 commit 2023-06-14 13:17:29 +02:00
c119cb128d Fix #107918: Weight Gradient tool paints over locked vertex groups
Exit the operator code if `DG_LOCK_WEIGHT` flag is set for active vertex
group to avoid painting over locked vertex group
Pratik Borhade requested review from Sybren A. Stüvel 2023-06-14 13:17:55 +02:00
Pratik Borhade requested review from Colin Basnett 2023-06-14 13:17:56 +02:00
Pratik Borhade added the
Module
Animation & Rigging
label 2023-06-14 13:18:14 +02:00
Pratik Borhade added 1 commit 2023-07-07 12:46:35 +02:00
Pratik Borhade added this to the Animation & Rigging project 2023-07-25 06:03:50 +02:00
Sybren A. Stüvel requested changes 2023-07-25 12:13:27 +02:00
@ -745,0 +748,4 @@
int ret;
if (dg->flag & DG_LOCK_WEIGHT) {

The code above this line should be extracted into their own function, like bool BKE_object_defgroup_active_is_locked(ob), as "figure out whether the active group is locked" is not part if this function's responsibility. Also I'm fairly sure the logic will have to be used in other areas as well (for example in vertex_group_vert_select_unlocked_poll()), and then it's just a single function call to refactor those. That refactor is not for this PR though.

The code above this line should be extracted into their own function, like `bool BKE_object_defgroup_active_is_locked(ob)`, as "figure out whether the active group is locked" is not part if this function's responsibility. Also I'm fairly sure the logic will have to be used in other areas as well (for example in `vertex_group_vert_select_unlocked_poll()`), and then it's just a single function call to refactor those. That refactor is not for this PR though.
Author
Member

yes, noticed we could use this function in other areas. Let me know if you want the cleanup/refactor in new PR

yes, noticed we could use this function in other areas. Let me know if you want the cleanup/refactor in new PR
Pratik Borhade added 1 commit 2023-07-26 11:31:42 +02:00
36d7a7e9dd New function BKE_object_defgroup_active_is_locked
Use it to check whether active vertex group is locked or not (for
painting)
Pratik Borhade added 1 commit 2023-07-26 11:39:56 +02:00
Sybren A. Stüvel approved these changes 2023-07-27 11:31:40 +02:00
Sybren A. Stüvel left a comment
Member

Much better, just one tiny nag that can be addressed when landing.

Much better, just one tiny nag that can be addressed when landing.
@ -146,0 +147,4 @@
/**
* Return lock status of active vertex group.
*/
bool BKE_object_defgroup_active_is_locked(struct Object *ob);

ob should be a const pointer, as it won't get changed by this function.

`ob` should be a `const` pointer, as it won't get changed by this function.
Sybren A. Stüvel manually merged commit 69150a35ba into main 2023-07-27 11:32:38 +02:00

OOPS sorry I accidentally marked the wrong PR as merged! No idea how to un-mark it 😿

OOPS sorry I accidentally marked the wrong PR as merged! No idea how to un-mark it 😿
Author
Member

No idea how to un-mark it

Not possible I guess 😅

I'll commit "const pointer" change separately then?

Thanks for the review & merging :)

> No idea how to un-mark it Not possible I guess 😅 I'll commit "const pointer" change separately then? Thanks for the review & merging :)

I'll commit "const pointer" change separately then?

Thanks for the review & merging :)

I didn't merge it! I only marked it as merged by accident, and the commit it now points to is unrelated to this PR (it belongs to #110424).
You could just squash & land things manually and mention the commit hash here for reference?

> I'll commit "const pointer" change separately then? > > Thanks for the review & merging :) I didn't merge it! I only marked it as merged by accident, and the commit it now points to is unrelated to this PR (it belongs to #110424). You could just squash & land things manually and mention the commit hash here for reference?
Author
Member

Committed manually: 6f0477bd1d

Committed manually: 6f0477bd1d669061ea4076f4ca547f22d093a9d6
Pratik Borhade deleted branch 107918-gradient-lock-vgroup 2023-08-02 09:13:24 +02:00
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 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#108974
No description provided.