Fix T48579: RNA shadows new custom properties

2016-06-06 12:19:58 +10:00
parent 04bcaf07dc
commit 7f57c99be8
1 changed files with 4 additions and 1 deletions
--- 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)