Fix #108737: Python error in Property Editor search menu #108795

Merged
Philipp Oeser merged 2 commits from lichtwerk/blender:108737 into blender-v3.6-release 2023-06-09 15:07:06 +02:00
Member

Caused by 5ca65001ea (which was already patched with ae7c71ef09 and
fa5cc84a0a)

Getting the right modifier would still fail / throw errors when not done
from the modifier extra ops dropdown.
Only there, a 'modifier' attribute is set for context (via
uiLayoutSetContextPointer in modifier_ops_extra_draw).

So now check if a 'modifier' attribute is set for context (and fallback
to using the active modifier instead).
This way, polling errors in F3 search are gone and you can actually
execute the operators which are also in modifier extra ops dropdown from
elsewhere (e.g. F3 search).

Caused by 5ca65001ea9e (which was already patched with ae7c71ef0902 and fa5cc84a0a52) Getting the right modifier would still fail / throw errors when not done from the modifier extra ops dropdown. Only there, a 'modifier' attribute is set for context (via `uiLayoutSetContextPointer` in `modifier_ops_extra_draw`). So now check if a 'modifier' attribute is set for context (and fallback to using the active modifier instead). This way, polling errors in F3 search are gone and you can actually execute the operators which are also in modifier extra ops dropdown from elsewhere (e.g. F3 search).
Philipp Oeser added 1 commit 2023-06-09 10:38:56 +02:00
3b64069d8d Fix #108737: Python error in Property Editor search menu
Caused by 5ca65001ea (which was already patched with ae7c71ef09 and
fa5cc84a0a)

Getting the right modifier would still fail / throw errors when not done
from the modifier extra ops dropdown.
Only there,  a 'modifier' attribute is set for context (via
`uiLayoutSetContextPointer` in `modifier_ops_extra_draw`).

So now check if a 'modifier' attribute is set for context (and fallback
to using the active modifier instead).
This way, polling errors in F3 search are gone and you can actually
execute the operators which are also in modifier extra ops dropdown from
elsewhere (e.g. F3 search).
Philipp Oeser requested review from Hans Goudey 2023-06-09 10:39:05 +02:00
Philipp Oeser added this to the Nodes & Physics project 2023-06-09 10:39:11 +02:00
Philipp Oeser added the
Interest
Geometry Nodes
Interest
User Interface
labels 2023-06-09 10:39:25 +02:00
Hans Goudey reviewed 2023-06-09 14:08:57 +02:00
Hans Goudey left a comment
Member

Thanks. I wonder if the area none-ness and type checks could be removed now. They seem redundant now with the hasattr check.

Thanks. I wonder if the area none-ness and type checks could be removed now. They seem redundant now with the `hasattr` check.
Jacques Lucke approved these changes 2023-06-09 14:18:38 +02:00
@ -46,3 +46,3 @@
def get_context_modifier(context):
area = context.area
if (area is not None) and (area.type == 'PROPERTIES'):
# Context only has a 'modifier' attribute in the modifier extra ops dropdown
Member

Missing .

Missing `.`
Author
Member

Good points, thx checking, will update.

Good points, thx checking, will update.
Philipp Oeser added 1 commit 2023-06-09 14:37:26 +02:00
Hans Goudey approved these changes 2023-06-09 14:40:37 +02:00
Hans Goudey left a comment
Member

Beautiful!

Beautiful!
Philipp Oeser merged commit 0696dd636c into blender-v3.6-release 2023-06-09 15:07:06 +02:00
Philipp Oeser deleted branch 108737 2023-06-09 15:07:09 +02:00
Sign in to join this conversation.
No reviewers
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
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#108795
No description provided.