From e9db9f2a917815bdfa1ac35db474d17f0c3bbc43 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 23 Nov 2009 13:06:26 +0000
Subject: [PATCH] - made properties in the view3d panel only show when there
 are some properties available since this the option to add props isnt in this
 panel - remove print on startup

---
 release/scripts/io/export_3ds.py        |  1 -
 release/scripts/modules/bpy/__init__.py |  1 -
 release/scripts/ui/space_view3d.py      | 27 ++++++++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/release/scripts/io/export_3ds.py b/release/scripts/io/export_3ds.py
index 545a35d6651..5f585ac4336 100644
--- a/release/scripts/io/export_3ds.py
+++ b/release/scripts/io/export_3ds.py
@@ -1132,7 +1132,6 @@ class Export3DS(bpy.types.Operator):
 		return ('RUNNING_MODAL',)
 	
 	def poll(self, context): # Poll isnt working yet
-		print("Poll")
 		return context.active_object != None
 
 bpy.ops.add(Export3DS)
diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py
index bbda95837ad..39b8fd340ba 100644
--- a/release/scripts/modules/bpy/__init__.py
+++ b/release/scripts/modules/bpy/__init__.py
@@ -44,7 +44,6 @@ def load_scripts(reload_scripts=False):
             return None
 
     for base_path in utils.script_paths():
-        print(base_path)
         for path_subdir in ("ui", "op", "io"):
             path = os.path.join(base_path, path_subdir)
             sys.path.insert(0, path)
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 12dba8a4df2..23f64d5e557 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -1770,21 +1770,34 @@ class VIEW3D_PT_context_properties(bpy.types.Panel):
     bl_label = "Properties"
     bl_default_closed = True
 
-    def draw(self, context):
-        import rna_prop_ui
-        # reload(rna_prop_ui)
+    def _active_context_member(self, context):
         obj = context.object
         if obj:
             mode = obj.mode
             if mode == 'POSE':
-                item = "active_pchan"
+                return "active_pchan"
             elif mode == 'EDIT' and obj.type == 'ARMATURE':
-                item = "active_bone"
+                return "active_bone"
             else:
-                item = "object"
+                return "object"
 
+        return ""
+    
+    def poll(self, context):
+        member = self._active_context_member(context)
+        if member:
+            return getattr(context, member).keys()
+
+        return False
+
+    def draw(self, context):
+        import rna_prop_ui
+        # reload(rna_prop_ui)
+        member = self._active_context_member(context)
+
+        if member:
             # Draw with no edit button
-            rna_prop_ui.draw(self.layout, context, item, False)
+            rna_prop_ui.draw(self.layout, context, member, False)
 
 
 # Operators