[Bf-blender-cvs] [7f57c99] master: Fix T48579: RNA shadows new custom properties

[Campbell Barton]

Commit: 7f57c99be87d6cb1b7ac9f005fa79c374812a8b6
Author: Campbell Barton
Date:   Mon Jun 6 12:19:58 2016 +1000
Branches: master
https://developer.blender.org/rB7f57c99be87d6cb1b7ac9f005fa79c374812a8b6

Fix T48579: RNA shadows new custom properties

===================================================================

M	release/scripts/startup/bl_operators/wm.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 76d41d9..cc8921f 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)