[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31609] trunk/blender/release/scripts: bugfix [#23534] Custom Properties not showing in OBJECT panel

[Campbell Barton]

Revision: 31609
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31609
Author:   campbellbarton
Date:     2010-08-27 08:11:42 +0200 (Fri, 27 Aug 2010)

Log Message:
-----------
bugfix [#23534] Custom Properties not showing in OBJECT panel

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

Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py	2010-08-27 04:51:56 UTC (rev 31608)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py	2010-08-27 06:11:42 UTC (rev 31609)
@@ -134,7 +134,7 @@
 
     @classmethod
     def poll(cls, context):
-        bool(eval("context.%s" % cls._context_path))
+        return bool(eval("context.%s" % cls._context_path))
 
     def draw(self, context):
         draw(self.layout, context, self._context_path)

Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py	2010-08-27 04:51:56 UTC (rev 31608)
+++ trunk/blender/release/scripts/ui/properties_object.py	2010-08-27 06:11:42 UTC (rev 31609)
@@ -312,7 +312,7 @@
         self.draw_settings(context, ob.animation_visualisation)
 
 
-class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, bpy.types.Panel):
+class OBJECT_PT_custom_props(bpy.types.Panel, PropertyPanel, ObjectButtonsPanel):
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object"