[Bf-blender-cvs] [e17b92f] master: Fix custom props not being handled correctly by manual/pyref UI menu entries.
Bastien Montagne
noreply at git.blender.org
Wed Nov 16 11:09:22 CET 2016
Commit: e17b92f535826bac45bb5205c557f88dee15e2ea
Author: Bastien Montagne
Date: Wed Nov 16 11:07:07 2016 +0100
Branches: master
https://developer.blender.org/rBe17b92f535826bac45bb5205c557f88dee15e2ea
Fix custom props not being handled correctly by manual/pyref UI menu entries.
===================================================================
M release/scripts/startup/bl_operators/wm.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 343fcdb..68a25ac 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -935,16 +935,23 @@ def _wm_doc_get_id(doc_id, do_url=True, url_prefix=""):
# detect if this is a inherited member and use that name instead
rna_parent = rna_class.bl_rna
- rna_prop = rna_parent.properties[class_prop]
- rna_parent = rna_parent.base
- while rna_parent and rna_prop == rna_parent.properties.get(class_prop):
- class_name = rna_parent.identifier
+ rna_prop = rna_parent.properties.get(class_prop)
+ if rna_prop:
rna_parent = rna_parent.base
+ while rna_parent and rna_prop == rna_parent.properties.get(class_prop):
+ class_name = rna_parent.identifier
+ rna_parent = rna_parent.base
- if do_url:
- url = ("%s/bpy.types.%s.html#bpy.types.%s.%s" % (url_prefix, class_name, class_name, class_prop))
+ if do_url:
+ url = ("%s/bpy.types.%s.html#bpy.types.%s.%s" % (url_prefix, class_name, class_name, class_prop))
+ else:
+ rna = ("bpy.types.%s.%s" % (class_name, class_prop))
else:
- rna = ("bpy.types.%s.%s" % (class_name, class_prop))
+ # We assume this is custom property, only try to generate generic url/rna_id...
+ if do_url:
+ url = ("%s/bpy.types.bpy_struct.html#bpy.types.bpy_struct.items" % (url_prefix,))
+ else:
+ rna = "bpy.types.bpy_struct"
return url if do_url else rna
More information about the Bf-blender-cvs
mailing list