Fix T40520: Properties panel in properties region in 3D view does not go away.

Ignore '_RNA_UI' IDP...

2 files changed, 8 insertions, 3 deletions

diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index 5180bdb59ce..e9c96d59eae 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -57,7 +57,6 @@ def rna_idprop_ui_prop_clear(item, prop):
     except:
         pass
 
-
 def rna_idprop_context_value(context, context_member, property_type):
     space = context.space_data
 
@@ -74,6 +73,10 @@ def rna_idprop_context_value(context, context_member, property_type):
 
     return rna_item, context_member
 
+def rna_idprop_has_properties(rna_item):
+    keys = rna_item.keys()
+    nbr_props = len(keys)
+    return (nbr_props > 1) or (nbr_props and '_RNA_UI' not in keys)
 
 def draw(layout, context, context_member, property_type, use_edit=True):
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 86e2bbf7808..3db489eb305 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3223,10 +3223,12 @@ class VIEW3D_PT_context_properties(Panel):
 
     @classmethod
     def poll(cls, context):
+        import rna_prop_ui
         member = cls._active_context_member(context)
+
         if member:
-            context_member = getattr(context, member)
-            return context_member and context_member.keys()
+            context_member, member = rna_prop_ui.rna_idprop_context_value(context, member, object)
+            return context_member and rna_prop_ui.rna_idprop_has_properties(context_member)
 
         return False