diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-19 16:04:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-19 16:04:14 +0300 |
commit | c2c71e59ed9c86ccd182993a7b942833f06864c8 (patch) | |
tree | 923d987ebffc3a37bd49a79011ecb475b2511cd4 /release | |
parent | 8dcd210de0661d0cb15d139e2dc724129e6ef432 (diff) |
fix for own error [#25299] custom properties not showing in viedw3d panel
error made when fixing id pinning, for non-properties space.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/rna_prop_ui.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index 7c77a01d646..2e3f9af8d1b 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -60,7 +60,11 @@ def rna_idprop_ui_prop_clear(item, prop): 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 diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 73e142f530b..14b23e20479 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2295,7 +2295,7 @@ class VIEW3D_PT_context_properties(bpy.types.Panel): 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(): |