[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25803] trunk/blender/source/blender: missing from last commit
Campbell Barton
ideasman42 at gmail.com
Thu Jan 7 17:53:15 CET 2010
Revision: 25803
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25803
Author: campbellbarton
Date: 2010-01-07 17:53:14 +0100 (Thu, 07 Jan 2010)
Log Message:
-----------
missing from last commit
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2010-01-07 16:19:38 UTC (rev 25802)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2010-01-07 16:53:14 UTC (rev 25803)
@@ -1274,7 +1274,7 @@
id->newid= NULL;
idn= id->next; /* id is possibly being inserted again */
- /* The check on the second line (LIB_APPEND_TAG) is done so its
+ /* The check on the second line (LIB_PRE_EXISTING) is done so its
* possible to tag data you dont want to be made local, used for
* appending data, so any libdata alredy linked wont become local
* (very nasty to discover all your links are lost after appending)
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-01-07 16:19:38 UTC (rev 25802)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-01-07 16:53:14 UTC (rev 25803)
@@ -11591,8 +11591,8 @@
if we are appending, but this object wasnt just added allong with a group,
then this is alredy used indirectly in the scene somewhere else and we didnt just append it.
- (ob->id.flag & LIB_APPEND_TAG)==0 means that this is a newly appended object - Campbell */
- if (is_group_append==0 || (ob->id.flag & LIB_APPEND_TAG)==0) {
+ (ob->id.flag & LIB_PRE_EXISTING)==0 means that this is a newly appended object - Campbell */
+ if (is_group_append==0 || (ob->id.flag & LIB_PRE_EXISTING)==0) {
int do_it= 0;
More information about the Bf-blender-cvs
mailing list