Fix #105278: IDProperty UI missing library overridable toggle #105370

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:105278 into blender-v3.5-release 2023-03-02 15:14:05 +01:00
2 changed files with 16 additions and 17 deletions

View File

@ -94,22 +94,21 @@ def rna_idprop_ui_create(
description=description, description=description,
default=default, default=default,
) )
return else:
if soft_min is None:
soft_min = min
if soft_max is None:
soft_max = max
if soft_min is None: ui_data.update(
soft_min = min subtype=subtype,
if soft_max is None: min=min,
soft_max = max max=max,
soft_min=soft_min,
ui_data.update( soft_max=soft_max,
subtype=subtype, description=description,
min=min, default=default,
max=max, )
soft_min=soft_min,
soft_max=soft_max,
description=description,
default=default,
)
prop_path = rna_idprop_quote_path(prop) prop_path = rna_idprop_quote_path(prop)

View File

@ -1894,7 +1894,6 @@ class WM_OT_properties_edit(Operator):
col.prop(self, "max_float") col.prop(self, "max_float")
col = layout.column() col = layout.column()
col.prop(self, "is_overridable_library")
col.prop(self, "use_soft_limits") col.prop(self, "use_soft_limits")
col = layout.column(align=True) col = layout.column(align=True)
@ -1923,7 +1922,6 @@ class WM_OT_properties_edit(Operator):
col.prop(self, "max_int") col.prop(self, "max_int")
col = layout.column() col = layout.column()
col.prop(self, "is_overridable_library")
col.prop(self, "use_soft_limits") col.prop(self, "use_soft_limits")
col = layout.column(align=True) col = layout.column(align=True)
@ -1949,6 +1947,8 @@ class WM_OT_properties_edit(Operator):
else: else:
layout.prop(self, "description") layout.prop(self, "description")
layout.prop(self, "is_overridable_library")
# Edit the value of a custom property with the given name on the RNA struct at the given data path. # Edit the value of a custom property with the given name on the RNA struct at the given data path.
# For supported types, this simply acts as a convenient way to create a popup for a specific property # For supported types, this simply acts as a convenient way to create a popup for a specific property