[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42285] trunk/blender/source/blender/ python/intern/bpy_library.c: fix [#29462] libraries.load can't have link= False when relative=True

[Campbell Barton]

Revision: 42285
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42285
Author:   campbellbarton
Date:     2011-11-30 06:15:35 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
fix [#29462] libraries.load can't have link=False when relative=True

was doing an unnecessary (and incorrect) library lookup.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_library.c

Modified: trunk/blender/source/blender/python/intern/bpy_library.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_library.c	2011-11-30 06:03:10 UTC (rev 42284)
+++ trunk/blender/source/blender/python/intern/bpy_library.c	2011-11-30 06:15:35 UTC (rev 42285)
@@ -265,8 +265,8 @@
 
 	/* create a dummy */
 	self_from= PyObject_New(BPy_Library, &bpy_lib_Type);
-	BLI_strncpy(self_from->relpath, self->relpath, sizeof(BPy_Library));
-	BLI_strncpy(self_from->abspath, self->abspath, sizeof(BPy_Library));
+	BLI_strncpy(self_from->relpath, self->relpath, sizeof(self_from->relpath));
+	BLI_strncpy(self_from->abspath, self->abspath, sizeof(self_from->abspath));
 
 	self_from->blo_handle= NULL;
 	self_from->flag= 0;
@@ -396,6 +396,7 @@
 		return NULL;
 	}
 	else {
+		Library *lib= mainl->curlib; /* newly added lib, assign before append end */
 		BLO_library_append_end(NULL, mainl, &(self->blo_handle), 0, self->flag);
 		BLO_blendhandle_close(self->blo_handle);
 		self->blo_handle= NULL;
@@ -406,9 +407,7 @@
 
 			/* append, rather than linking */
 			if ((self->flag & FILE_LINK)==0) {
-				Library *lib= BLI_findstring(&G.main->library, self->abspath, offsetof(Library, name));
-				if (lib)  BKE_library_make_local(bmain, lib, 1);
-				else      BLI_assert(!"cant find name of just added library!");
+				BKE_library_make_local(bmain, lib, 1);
 			}
 		}