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:
authorCampbell Barton <ideasman42@gmail.com>2016-06-06 05:19:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-06-06 05:23:01 +0300
commit7f57c99be87d6cb1b7ac9f005fa79c374812a8b6 (patch)
treeb64c43d86bb79c6961dcf0f9f9e853c94fc3cf6c /release
parent04bcaf07dc945578353a8675e1e5003d1c325102 (diff)
Fix T48579: RNA shadows new custom properties
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/wm.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 76d41d91b78..cc8921f1a8e 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1357,7 +1357,10 @@ class WM_OT_properties_add(Operator):
return prop_new
- prop = unique_name(item.keys())
+ prop = unique_name(
+ {*item.keys(),
+ *type(item).bl_rna.properties.keys(),
+ })
item[prop] = 1.0
rna_idprop_ui_prop_update(item, prop)