[Bf-blender-cvs] [8bb7031] lib-link-rework-temp: Minor cleanup.

Bastien Montagne noreply at git.blender.org
Mon Oct 5 12:18:02 CEST 2015


Commit: 8bb7031dec0b7b99265892395a23b364c3578b62
Author: Bastien Montagne
Date:   Mon Oct 5 12:17:51 2015 +0200
Branches: lib-link-rework-temp
https://developer.blender.org/rB8bb7031dec0b7b99265892395a23b364c3578b62

Minor cleanup.

===================================================================

M	source/blender/blenloader/BLO_readfile.h
M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index e65c4dd..0e3011a 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -234,7 +234,7 @@ struct ID *BLO_library_link_named_part(
 
 /**
  * Link a named datablock from an external blend file.
- * optionally instance the object/group in the scene when the flags are set.
+ * optionally instanciate the object/group in the scene when the flags are set.
  *
  * \param mainl The main database to link from (not the active one).
  * \param bh The blender file handle.
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4cb4fc0..2044bac 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -620,7 +620,7 @@ static Main *blo_find_main(FileData *fd, const char *filepath, const char *relab
 	
 	/* Adapted from BKE_libblock_alloc(), with no lock of main, it's most likely already locked by caller code. */
 	lib = BKE_libblock_alloc_notest(ID_LI);
-	if (lib) {
+	{
 		/* Add library datablock itself to 'main' Main, since libraries are **never** linked data.
 		 * Fixes bug where you could end with all ID_LI datablocks having the same name... */
 		ListBase *libraries = &((Main *)mainlist->first)->library;




More information about the Bf-blender-cvs mailing list