Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-27 10:11:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-27 10:11:42 +0400
commitb0b787ef38f9947b3176642556f5282eb3518f69 (patch)
tree7ee75791c371e7f3939d69ac74515ac50fd21ddd /release
parent3912f5540863022fa7632b547fad867bd7d24411 (diff)
bugfix [#23534] Custom Properties not showing in OBJECT panel
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/rna_prop_ui.py2
-rw-r--r--release/scripts/ui/properties_object.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index 91fc4e9092d..4ee0b40faa8 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -134,7 +134,7 @@ class PropertyPanel():
@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)
diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py
index bf1878cc666..35037b10216 100644
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/ui/properties_object.py
@@ -312,7 +312,7 @@ class OBJECT_PT_onion_skinning(OnionSkinButtonsPanel): #, bpy.types.Panel): # in
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"