Revision: 24642
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24642
Author: campbellbarton
Date: 2009-11-18 15:00:23 +0100 (Wed, 18 Nov 2009)
Log Message:
-----------
bone & object properties editing was broken.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_access.c
Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c
2009-11-18 13:33:52 UTC (rev 24641)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c
2009-11-18 14:00:23 UTC (rev 24642)
@@ -46,8 +46,15 @@
{
uiBut *but=NULL;
const char *propname= RNA_property_identifier(prop);
+ char prop_item[sizeof(((IDProperty *)NULL)->name)+4]; /**/
int arraylen= RNA_property_array_length(ptr, prop);
+ /* support for custom props */
+ if(RNA_property_is_idprop(prop)) {
+ sprintf(prop_item, "[\"%s\"]", propname);
+ propname= prop_item;
+ }
+
switch(RNA_property_type(prop)) {
case PROP_BOOLEAN: {
int value, length;
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2009-11-18 13:33:52 UTC
(rev 24641)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2009-11-18 14:00:23 UTC
(rev 24642)
@@ -816,6 +816,7 @@
/* check if the idproperty exists, for operators */
int RNA_property_is_set(PointerRNA *ptr, const char *name);
+int RNA_property_is_idprop(PropertyRNA *prop);
/* python compatible string representation of this property, (must be freed!)
*/
char *RNA_property_as_string(struct bContext *C, PointerRNA *ptr, PropertyRNA
*prop);
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-11-18
13:33:52 UTC (rev 24641)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-11-18
14:00:23 UTC (rev 24642)
@@ -2911,6 +2911,11 @@
}
}
+int RNA_property_is_idprop(PropertyRNA *prop)
+{
+ return (prop->magic!=RNA_MAGIC);
+}
+
/* string representation of a property, python
* compatible but can be used for display too*/
char *RNA_pointer_as_string(PointerRNA *ptr)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
