blender/blender

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

Philipp Oeser commented

2023-06-21 14:35:07 +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

label 2023-06-21 14:36:03 +02:00

Campbell Barton commented

2023-06-26 09:48:30 +02:00

Owner

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.

Philipp Oeser commented

2023-06-26 10:22:27 +02:00

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)?

Campbell Barton commented

2023-06-27 12:15:40 +02:00

Owner

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

Philipp Oeser 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

Philipp Oeser referenced this issue from a commit

2023-06-27 15:33:01 +02:00

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

Philipp Oeser referenced this issue from a commit

2023-07-04 13:55:26 +02:00

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

Christoph Lendenfeld referenced this issue from a commit

2023-07-06 10:14:58 +02:00

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

Philipp Oeser referenced this issue from a commit

2023-07-13 15:42:57 +02:00

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

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Viewport & EEVEE

Virtual Reality

Asset Browser Project

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Viewport & EEVEE

Needs Info from Developers

Needs Information from User

No Milestone

No project

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.