Skip to content

Fix theme properties not being handled correctly by MultiNodeEdit#115151

Merged
Repiteo merged 1 commit into
godotengine:masterfrom
YeldhamDev:multi_node_theme_fix
Apr 13, 2026
Merged

Fix theme properties not being handled correctly by MultiNodeEdit#115151
Repiteo merged 1 commit into
godotengine:masterfrom
YeldhamDev:multi_node_theme_fix

Conversation

@YeldhamDev

Copy link
Copy Markdown
Member
@YeldhamDev YeldhamDev added this to the 4.7 milestone Jan 19, 2026
@YeldhamDev YeldhamDev requested a review from a team January 19, 2026 22:43
@YeldhamDev YeldhamDev requested a review from a team as a code owner January 19, 2026 22:43
@YeldhamDev YeldhamDev added bug topic:editor cherrypick:4.6 Considered for cherry-picking into a future 4.6.x release labels Jan 19, 2026
Comment thread core/object/object.h Outdated
@YeldhamDev YeldhamDev force-pushed the multi_node_theme_fix branch from 86fb8cc to 55ee0fb Compare January 19, 2026 23:17
@YeldhamDev YeldhamDev requested a review from a team as a code owner January 19, 2026 23:17
@Repiteo Repiteo requested a review from a team as a code owner February 17, 2026 20:09
@YeldhamDev YeldhamDev force-pushed the multi_node_theme_fix branch from 55ee0fb to 0f640e1 Compare April 2, 2026 15:28
Comment on lines +193 to +211
if (usage_data->info.name == F.name &&
usage_data->info.type == F.type &&
usage_data->info.class_name == F.class_name &&
usage_data->info.hint == F.hint &&
usage_data->info.hint_string == F.hint_string) {
if (usage_data->info.usage != F.usage) {
// Checkable properties (mostly theme items) need special treatment.
if (usage_data->info.usage & PROPERTY_USAGE_CHECKABLE && F.usage & PROPERTY_USAGE_CHECKABLE) {
if (usage_data->info.usage & PROPERTY_USAGE_CHECKED) {
F.usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
} else {
F.usage &= ~(PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED);
}

if (usage_data->info.usage != F.usage) {
continue;
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there some way to de-duplicate this code?

@YeldhamDev YeldhamDev Apr 13, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The question is where the centralized code would reside. Considering that it exists only in two places, we can kick this can forward for a while.

@Repiteo Repiteo merged commit 8fd7cda into godotengine:master Apr 13, 2026
20 checks passed
@Repiteo

Repiteo commented Apr 13, 2026

Copy link
Copy Markdown
Contributor

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug cherrypick:4.6 Considered for cherry-picking into a future 4.6.x release topic:editor

3 participants