Fix #109198: Enum properties don't display text in Dope Sheet sliders #109205

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:109198 into main 2023-06-27 15:32:59 +02:00
Member

uiDefAutoButR (or actually uiDefButR_prop > ui_def_but_rna later
down the line) has this behavior when "" string is passed in, it will
not display text on or next to the button.
This is of course desired in most scenarios -- it might even be desired
for non-icon enums in certain cases (though this is already a bit harder
to find cases for), so changing behavior in said functions is probably
not what we want.

The behavior - from the dopsheet sliders - would seem like a bug though.

Passing NULL (instead of "") to uiDefAutoButR results in properly
displaying the chosen item on the dropdown for enums, but for other
property types it would then show the property ui name alongside the
button (which is not what we want in the dopsheet, UI names are already
drawn there separately).

So now, pass "" or NULL conditionally (depending on property type
PROP_ENUM).

`uiDefAutoButR` (or actually `uiDefButR_prop` > `ui_def_but_rna` later down the line) has this behavior when "" string is passed in, it will not display text on or next to the button. This is of course desired in most scenarios -- it might even be desired for non-icon enums in certain cases (though this is already a bit harder to find cases for), so changing behavior in said functions is probably not what we want. The behavior - from the dopsheet sliders - would seem like a bug though. Passing NULL (instead of "") to `uiDefAutoButR` results in properly displaying the chosen item on the dropdown for enums, but for other property types it would then show the property ui name alongside the button (which is not what we want in the dopsheet, UI names are already drawn there separately). So now, pass "" or NULL conditionally (depending on property type `PROP_ENUM`).
Philipp Oeser requested review from Sybren A. Stüvel 2023-06-21 14:35:33 +02:00
Philipp Oeser requested review from Campbell Barton 2023-06-21 14:35:42 +02:00
Philipp Oeser added this to the Animation & Rigging project 2023-06-21 14:35:56 +02:00
Philipp Oeser added the
Interest
User Interface
label 2023-06-21 14:36:03 +02:00

While the change seems fine, there is another call to uiDefAutoButR (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function.

While the change seems fine, there is another call to `uiDefAutoButR` (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function.
Author
Member

While the change seems fine, there is another call to uiDefAutoButR (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function.

If this is about the case ANIMTYPE_NLACURVE, I think these are the NLA control curves (and are always float - never enum)?

> While the change seems fine, there is another call to `uiDefAutoButR` (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function. If this is about the case `ANIMTYPE_NLACURVE`, I think these are the NLA control curves (and are always float - never enum)?

While the change seems fine, there is another call to uiDefAutoButR (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function.

If this is about the case ANIMTYPE_NLACURVE, I think these are the NLA control curves (and are always float - never enum)?

It's just an RNA path, so it could be any type AFAICS, but I couldn't see how to run the ANIMTYPE_NLACURVE code path. Since it only runs when renaming, it doesn't seem as likely to be as much as a problem as #109198, although it would be good to verify this.

> > While the change seems fine, there is another call to `uiDefAutoButR` (the first instance in this function), could you check if the same change should be applied there too, if not, comment why the check for enum is needed here but nowhere else in this function. > > If this is about the case `ANIMTYPE_NLACURVE`, I think these are the NLA control curves (and are always float - never enum)? It's just an RNA path, so it could be any type AFAICS, but I couldn't see how to run the `ANIMTYPE_NLACURVE` code path. Since it only runs when renaming, it doesn't seem as likely to be as much as a problem as #109198, although it would be good to verify this.
Campbell Barton approved these changes 2023-06-27 12:16:17 +02:00
Philipp Oeser changed title from Fix #109198: Enum properties don't display text in Dope Sheet sliders to Fix #109198: Enum properties don't display text in Dope Sheet sliders 2023-06-27 15:15:37 +02:00
lichtwerk changed target branch from blender-v3.6-release to main 2023-06-27 15:15:44 +02:00
Philipp Oeser force-pushed 109198 from 59b520f99a to 9ab443ae58 2023-06-27 15:31:21 +02:00 Compare
Philipp Oeser merged commit 258ba398ed into main 2023-06-27 15:32:59 +02:00
Philipp Oeser deleted branch 109198 2023-06-27 15:33:00 +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
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#109205
No description provided.