Revision: 36741 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36741 Author: campbellbarton Date: 2011-05-18 09:07:15 +0000 (Wed, 18 May 2011) Log Message: ----------- fix for one of the issues in [#27035] 3 problems: crash and enum "REGION" not found in ('VERTS') now constraint macro argument shows as 'NORMAL' rather then '<UNKNOWN ENUM>'
Modified Paths: -------------- trunk/blender/source/blender/makesrna/RNA_access.h trunk/blender/source/blender/makesrna/intern/rna_access.c Modified: trunk/blender/source/blender/makesrna/RNA_access.h =================================================================== --- trunk/blender/source/blender/makesrna/RNA_access.h 2011-05-18 08:36:06 UTC (rev 36740) +++ trunk/blender/source/blender/makesrna/RNA_access.h 2011-05-18 09:07:15 UTC (rev 36741) @@ -903,7 +903,7 @@ /* python compatible string representation of this property, (must be freed!) */ char *RNA_property_as_string(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop); -char *RNA_pointer_as_string(PointerRNA *ptr); +char *RNA_pointer_as_string(struct bContext *C, PointerRNA *ptr); /* Function */ Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-05-18 08:36:06 UTC (rev 36740) +++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-05-18 09:07:15 UTC (rev 36741) @@ -4036,8 +4036,9 @@ } /* string representation of a property, python - * compatible but can be used for display too*/ -char *RNA_pointer_as_string(PointerRNA *ptr) + * compatible but can be used for display too, + * context may be NULL */ +char *RNA_pointer_as_string(bContext *C, PointerRNA *ptr) { DynStr *dynstr= BLI_dynstr_new(); char *cstring; @@ -4057,7 +4058,7 @@ BLI_dynstr_append(dynstr, ", "); first_time= 0; - cstring = RNA_property_as_string(NULL, ptr, prop); + cstring = RNA_property_as_string(C, ptr, prop); BLI_dynstr_appendf(dynstr, "\"%s\":%s", propname, cstring); MEM_freeN(cstring); } @@ -4175,7 +4176,7 @@ case PROP_POINTER: { PointerRNA tptr= RNA_property_pointer_get(ptr, prop); - cstring= RNA_pointer_as_string(&tptr); + cstring= RNA_pointer_as_string(C, &tptr); BLI_dynstr_append(dynstr, cstring); MEM_freeN(cstring); break; @@ -4194,7 +4195,7 @@ first_time= 0; /* now get every prop of the collection */ - cstring= RNA_pointer_as_string(&itemptr); + cstring= RNA_pointer_as_string(C, &itemptr); BLI_dynstr_append(dynstr, cstring); MEM_freeN(cstring); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs