2.5: Various Fixes

[blender-staging.git] / source / blender / makesrna / intern / rna_access.c

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index d9d4852a72cf3d5fa1904fcfd4164bb366f855b6..0a4cc2a023e84f7b49f631044baa2aa4c53ae80e 100644 (file)
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -752,7 +752,7 @@ int RNA_property_editable(PointerRNA *ptr, PropertyRNA *prop)
        
        id= ptr->id.data;
 
-       return (flag & PROP_EDITABLE) && (!id || !id->lib);
+       return (flag & PROP_EDITABLE) && (!id || !id->lib || (flag & PROP_LIB_EXCEPTION));
 }
 
 int RNA_property_animateable(PointerRNA *ptr, PropertyRNA *prop)