tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

no need to call BLI_countlist on idproperty groups when comparing.

This commit is contained in:
Campbell Barton 2013-01-14 12:02:10 +00:00
parent 3475f5137a
commit ba78e3e312
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/idprop.c
View File

@ -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) {

9
source/blender/blenloader/intern/readfile.c
View File

@ -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) {