diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-14 16:02:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-14 16:02:10 +0400 |
commit | ba78e3e312fbef1b1d9e4b5432ec5d6e700717f0 (patch) | |
tree | d6ff67e376667a11ad3ccc8dd720e2013c35c4db /source | |
parent | 3475f5137ad08eb81926a672e588f0af9b62756c (diff) |
no need to call BLI_countlist on idproperty groups when comparing.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 3be47668fb5..9086ef49e4d 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -663,7 +663,7 @@ int IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const int is_s { IDProperty *link1, *link2; - if (is_strict && BLI_countlist(&prop1->data.group) != BLI_countlist(&prop2->data.group)) + if (is_strict && prop1->len != prop2->len) return 0; for (link1 = prop1->data.group.first; link1; link1 = link1->next) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f003b029ae9..029e16969db 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5546,7 +5546,14 @@ static void lib_link_screen(FileData *fd, Main *main) } } -/* Only for undo files, or to restore a screen after reading without UI... */ +/** + * Only for undo files, or to restore a screen after reading without UI... + * + * user + * - 0: no usercount change + * - 1: ensure a user + * - 2: ensure a real user (even if a fake one is set) + */ static void *restore_pointer_by_name(Main *mainp, ID *id, int user) { if (id) { |