archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for error comparing py-struct members

Browse Source 
if 2 pyrna structs used the same pointer they could incorrectly compare as true, this caused an error in theme saving because an item could match its parent and stop writing (to prevent recursive writing of same data).

eg:
  context.user_preferences.themes[0].user_interface.wcol_regular == context.user_preferences.themes[0].user_interface
This commit is contained in:
Campbell Barton
2012-01-13 11:36:32 +00:00
parent e06d82227c
commit 0f34ce27cf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/bpy_rna.c
View File

@@ -745,7 +745,7 @@ int pyrna_enum_value_from_id(EnumPropertyItem *item, const char *identifier, int
static int pyrna_struct_compare(BPy_StructRNA *a, BPy_StructRNA *b) static int pyrna_struct_compare(BPy_StructRNA *a, BPy_StructRNA *b)
{ {
return (a->ptr.data == b->ptr.data) ? 0 : -1; return (a->ptr.data == b->ptr.data && a->ptr.type == b->ptr.type) ? 0 : -1;
} }
static int pyrna_prop_compare(BPy_PropertyRNA *a, BPy_PropertyRNA *b) static int pyrna_prop_compare(BPy_PropertyRNA *a, BPy_PropertyRNA *b)