Fix #121134: Hide Proportional Editing for armature editmode #121205

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:121134 into main 2024-05-02 09:23:21 +02:00
Member

When transforming, both TransConvertType_EditArmature /
TransConvertType_Pose get disabled from proportional editing
(TransInfo gets flagged CTX_NO_PET in init_proportional_edit).
This is intentional.

UI checks the mode and showing proportional editing properties was
already skipped for 'POSE' mode, but armatures in 'EDIT' mode would
still show them.

To resolve, also skip the UI for EDIT_ARMATURE mode.

When transforming, both `TransConvertType_EditArmature` / `TransConvertType_Pose` get disabled from proportional editing (`TransInfo` gets flagged `CTX_NO_PET` in `init_proportional_edit`). This is intentional. UI checks the mode and showing proportional editing properties was already skipped for 'POSE' mode, but armatures in 'EDIT' mode would still show them. To resolve, also skip the UI for `EDIT_ARMATURE` mode.
Philipp Oeser added 1 commit 2024-04-29 12:38:21 +02:00
1abec12dba Fix #121134: Hide Proportional Editing for armature editmode
When transforming, both `TransConvertType_EditArmature` /
`TransConvertType_Pose` get disabled from proportional editing
(`TransInfo` gets flagged `CTX_NO_PET` in `init_proportional_edit`).
This is intentional.

UI checks the mode and showing proportional editing properties was
already skipped for 'POSE' mode, but armatures in 'EDIT' mode would
still show them.

To resolve, also skip the UI for armatures in 'EDIT' mode .
Philipp Oeser added this to the Animation & Rigging project 2024-04-29 12:38:41 +02:00
Philipp Oeser added the
Interest
Modeling
Interest
User Interface
labels 2024-04-29 12:38:54 +02:00
Philipp Oeser requested review from Sybren A. Stüvel 2024-04-29 12:39:01 +02:00
Sybren A. Stüvel requested changes 2024-04-29 13:03:02 +02:00
Dismissed
Sybren A. Stüvel left a comment
Member

I think this is a good change, thanks. Just some thoughts about the code:

Wouldn't it be better to just use context.mode in this code, instead? That already differentiates between the edit modes; it can be EDIT_MESH, EDIT_ARMATURE, EDIT_METABALL, etc.

If that's undesirable (because of the wide-arching object_mode == 'EDIT' that then would have to be explicitly split up as well), I would recommend something like and context.mode != 'EDIT_ARMATURE' instead of constructing is_armature_editmode.

And finally, if you do want to keep is_armature_editmode, you can use:

is_armature_editmode = object_mode == 'EDIT' and obj.type == 'ARMATURE' 

If object_mode == 'EDIT' already implies "there is an object".

I think this is a good change, thanks. Just some thoughts about the code: Wouldn't it be better to just use `context.mode` in this code, instead? That already differentiates between the edit modes; it can be `EDIT_MESH`, `EDIT_ARMATURE`, `EDIT_METABALL`, etc. If that's undesirable (because of the wide-arching `object_mode == 'EDIT'` that then would have to be explicitly split up as well), I would recommend something like `and context.mode != 'EDIT_ARMATURE'` instead of constructing `is_armature_editmode`. And finally, if you do want to keep `is_armature_editmode`, you can use: ```py is_armature_editmode = object_mode == 'EDIT' and obj.type == 'ARMATURE' ``` If `object_mode == 'EDIT'` already implies "there is an object".
Philipp Oeser added 1 commit 2024-04-29 14:23:45 +02:00
Author
Member

Thx for the input, kept it simple for now and went with EDIT_ARMATURE

Thx for the input, kept it simple for now and went with `EDIT_ARMATURE`
Sybren A. Stüvel approved these changes 2024-04-29 15:02:41 +02:00
Sybren A. Stüvel left a comment
Member

LGTM, apart from the formatting. I'm guessing Gitea messed up?

LGTM, apart from the formatting. I'm guessing Gitea messed up?
Author
Member

LGTM, apart from the formatting. I'm guessing Gitea messed up?

better now?

> LGTM, apart from the formatting. I'm guessing Gitea messed up? > better now?

Doesn't look different to me:

image

it's that 'OBJECT' line indentation that I find weird. Is that really how autopep8 formats it?

Don't let me block this PR, if the formatter does this, so be it. Personally I'd find it annoying enough to just assign the set to a variable, and use that in the if statement instead ;-)

Doesn't look different to me: ![image](/attachments/e4e35cd3-3f4e-49c8-a319-0269defbcbfb) it's that `'OBJECT'` line indentation that I find weird. Is that really how `autopep8` formats it? Don't let me block this PR, if the formatter does this, so be it. Personally I'd find it annoying enough to just assign the set to a variable, and use that in the `if` statement instead ;-)
Author
Member

That is indeed what make format does...

That is indeed what `make format` does...
Philipp Oeser merged commit 7629ef218e into main 2024-05-02 09:23:21 +02:00
Philipp Oeser deleted branch 121134 2024-05-02 09:23:24 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser Project (Legacy)
Interest
Asset System
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#121205
No description provided.