diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
| commit | 705f23064e8ba3e96690d163c98687fc79d4a179 (patch) | |
| tree | 13251a1f24cfb219a62c4f64c6750cadec7ff712 /source/blender/makesrna/RNA_access.h | |
| parent | 9e59fed5d8ff9f63477b3a73d2b02eaa55abd6cd (diff) | |
| parent | dbdd1c2ea7496546f4f7e17350720a6005cdb187 (diff) | |
svn merge ^/trunk/blender -r43294:43338
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index ee069cccb78..172c71000b8 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -938,7 +938,8 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name); } /* check if the idproperty exists, for operators */ -int RNA_property_is_set(PointerRNA *ptr, const char *name); +int RNA_property_is_set(PointerRNA *ptr, PropertyRNA *prop); +int RNA_struct_property_is_set(PointerRNA *ptr, const char *identifier); int RNA_property_is_idprop(PropertyRNA *prop); /* python compatible string representation of this property, (must be freed!) */ @@ -1000,7 +1001,7 @@ StructRNA *ID_code_to_RNA_type(short idcode); /* macro which inserts the function name */ -#ifdef __GNUC__ +#if defined __GNUC__ || defined __sun # define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args) #else # define RNA_warning(format, ...) _RNA_warning("%s: " format "\n", __FUNCTION__, __VA_ARGS__) |