[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53784] trunk/blender/source/blender: no need to call BLI_countlist on idproperty groups when comparing.

[Campbell Barton]

Revision: 53784
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53784
Author:   campbellbarton
Date:     2013-01-14 12:02:10 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
no need to call BLI_countlist on idproperty groups when comparing.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/idprop.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c	2013-01-14 10:36:43 UTC (rev 53783)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c	2013-01-14 12:02:10 UTC (rev 53784)
@@ -663,7 +663,7 @@
 		{
 			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) {

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-01-14 10:36:43 UTC (rev 53783)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-01-14 12:02:10 UTC (rev 53784)
@@ -5546,7 +5546,14 @@
 	}
 }
 
-/* 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) {