[Bf-blender-cvs] [867c49b] master: Fix T46345: Registrable props could be modified
Julian Eisel
noreply at git.blender.org
Tue Oct 6 12:57:42 CEST 2015
Commit: 867c49b962fed324b41492e4cbaf586b5020e2dd
Author: Julian Eisel
Date: Tue Oct 6 21:51:35 2015 +1100
Branches: master
https://developer.blender.org/rB867c49b962fed324b41492e4cbaf586b5020e2dd
Fix T46345: Registrable props could be modified
===================================================================
M 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 b7478fd..b41568d 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1570,7 +1570,9 @@ bool RNA_property_editable(PointerRNA *ptr, PropertyRNA *prop)
prop = rna_ensure_property(prop);
flag = prop->editable ? prop->editable(ptr) : prop->flag;
- return (flag & PROP_EDITABLE) && (!id || !id->lib || (prop->flag & PROP_LIB_EXCEPTION));
+ return ((flag & PROP_EDITABLE) &&
+ (flag & PROP_REGISTER) == 0 &&
+ (!id || !id->lib || (prop->flag & PROP_LIB_EXCEPTION)));
}
bool RNA_property_editable_flag(PointerRNA *ptr, PropertyRNA *prop)
More information about the Bf-blender-cvs
mailing list