diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
| commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
| tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/makesrna/intern/rna_access.c | |
| parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
| parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) | |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/makesrna/intern/rna_access.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4c1c377cb9f..c88944b4584 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -233,7 +233,7 @@ static void rna_idproperty_touch(IDProperty *idprop) } /* return a UI local ID prop definition for this prop */ -IDProperty *rna_idproperty_ui(PropertyRNA *prop) +static IDProperty *rna_idproperty_ui(PropertyRNA *prop) { IDProperty *idprop; @@ -618,7 +618,7 @@ PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier) } /* Find the property which uses the given nested struct */ -PropertyRNA *RNA_struct_find_nested(PointerRNA *ptr, StructRNA *srna) +static PropertyRNA *RNA_struct_find_nested(PointerRNA *ptr, StructRNA *srna) { PropertyRNA *prop = NULL; |