[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33786] trunk/blender/release/scripts: fix for own error [#25299] custom properties not showing in viedw3d panel

[Campbell Barton]

Revision: 33786
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33786
Author:   campbellbarton
Date:     2010-12-19 14:04:14 +0100 (Sun, 19 Dec 2010)

Log Message:
-----------
fix for own error [#25299] custom properties not showing in viedw3d panel
error made when fixing id pinning, for non-properties space.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rna_prop_ui.py
    trunk/blender/release/scripts/ui/space_view3d.py

Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py	2010-12-19 12:38:20 UTC (rev 33785)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py	2010-12-19 13:04:14 UTC (rev 33786)
@@ -60,7 +60,11 @@
 
 def rna_idprop_context_value(context, context_member, property_type):
     space = context.space_data
-    pin_id = space.pin_id
+    
+    if space is None or isinstance(space, bpy.types.SpaceProperties):
+        pin_id = space.pin_id
+    else:
+        pin_id = None
 
     if pin_id and isinstance(pin_id, property_type):
         rna_item = pin_id

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2010-12-19 12:38:20 UTC (rev 33785)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2010-12-19 13:04:14 UTC (rev 33786)
@@ -2295,7 +2295,7 @@
 
         if member:
             # Draw with no edit button
-            rna_prop_ui.draw(self.layout, context, member, False)
+            rna_prop_ui.draw(self.layout, context, member, object, False)
 
 
 def register():