Merge branch 'blender-v3.5-release'

scripts/modules/rna_prop_ui.py

@@ -94,22 +94,21 @@ def rna_idprop_ui_create(
             description=description,
             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:
-        soft_min = min
-    if soft_max is None:
-        soft_max = max
-
-    ui_data.update(
-        subtype=subtype,
-        min=min,
-        max=max,
-        soft_min=soft_min,
-        soft_max=soft_max,
-        description=description,
-        default=default,
-    )
+        ui_data.update(
+            subtype=subtype,
+            min=min,
+            max=max,
+            soft_min=soft_min,
+            soft_max=soft_max,
+            description=description,
+            default=default,
+        )
 
     prop_path = rna_idprop_quote_path(prop)
 

scripts/startup/bl_operators/wm.py

@@ -1894,7 +1894,6 @@ class WM_OT_properties_edit(Operator):
             col.prop(self, "max_float")
 
             col = layout.column()
-            col.prop(self, "is_overridable_library")
             col.prop(self, "use_soft_limits")
 
             col = layout.column(align=True)
@@ -1923,7 +1922,6 @@ class WM_OT_properties_edit(Operator):
             col.prop(self, "max_int")
 
             col = layout.column()
-            col.prop(self, "is_overridable_library")
             col.prop(self, "use_soft_limits")
 
             col = layout.column(align=True)
@@ -1949,6 +1947,8 @@ class WM_OT_properties_edit(Operator):
         else:
             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.
 # For supported types, this simply acts as a convenient way to create a popup for a specific property