Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDemeter Dzadik <Mets>2020-06-30 16:01:56 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-30 16:06:33 +0300
commit5b03f49302a39577f2373906cfba19feebfaa9ba (patch)
treec7af4f8c0f5eb96f08f468decfd12ee3325a550d /release
parente93663363ea11e2baa7518498abae3073b48a8b4 (diff)
Custom Properties: support default values for strings
Differential Revision: https://developer.blender.org/D8102
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/rna_prop_ui.py2
-rw-r--r--release/scripts/startup/bl_operators/wm.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index 8dda8c90f85..662c1d908fc 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -130,7 +130,7 @@ def rna_idprop_ui_prop_default_set(item, prop, value):
try:
prop_type, is_array = rna_idprop_value_item_type(item[prop])
- if prop_type in {int, float}:
+ if prop_type in {int, float, str}:
if is_array and isinstance(value, ARRAY_TYPES):
value = [prop_type(item) for item in value]
if any(value):
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 04bd5687364..a543ea6685c 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1457,7 +1457,7 @@ class WM_OT_properties_edit(Operator):
proptype, is_array = rna_idprop_value_item_type(value)
row = layout.row()
- row.enabled = proptype in {int, float}
+ row.enabled = proptype in {int, float, str}
row.prop(self, "default")
row = layout.row(align=True)