Commit: cfe08b2b19b2418e2c0b4338fcbff44e07a49ca6
Author: Bastien Montagne
Date: Mon Oct 12 12:39:39 2015 +0200
Branches: lib-link-rework-temp
https://developer.blender.org/rBcfe08b2b19b2418e2c0b4338fcbff44e07a49ca6
Some 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 0e3011a..f417df7 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -234,14 +234,14 @@ struct ID *BLO_library_link_named_part(
/**
* Link a named datablock from an external blend file.
- * optionally instanciate the object/group in the scene when the flags are set.
+ * optionally instantiate 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.
* \param idname The name of the datablock (without the 2 char ID prefix)
* \param idcode The kind of datablock to link.
* \param flag Options for linking, used for instancing.
- * \param scene The scene in which to instanciate objects/groups (if NULL, no
instanciation is done).
+ * \param scene The scene in which to instantiate objects/groups (if NULL, no
instantiation is done).
* \param v3d The active View3D (only to define active layers for instanced
objects & groups, can be NULL).
* \return the appended ID when found.
*/
@@ -257,7 +257,7 @@ struct ID *BLO_library_link_named_part_ex(
* \param mainl The main database to link from (not the active one).
* \param bh The blender file handle (WARNING! may be freed by this function!).
* \param flag Options for linking, used for instancing.
- * \param scene The scene in which to instanciate objects/groups (if NULL, no
instanciation is done).
+ * \param scene The scene in which to instantiate objects/groups (if NULL, no
instantiation is done).
* \param v3d The active View3D (only to define active layers for instanced
objects & groups, can be NULL).
*/
void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag,
struct Scene *scene, struct View3D *v3d);
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 57cae9b..198c5ae 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9730,7 +9730,7 @@ static Main *library_link_begin(Main *mainvar, FileData
**fd, const char *filepa
(*fd)->mainlist = MEM_callocN(sizeof(ListBase), "FileData.mainlist");
- /* clear for group instancing tag */
+ /* clear for group instantiating tag */
BKE_main_id_tag_listbase(&(mainvar->group), false);
/* make mains */
@@ -9791,7 +9791,7 @@ static void library_link_end(Main *mainl, FileData **fd,
const short flag, Scene
fix_relpaths_library(G.main->name, mainvar); /* make all relative
paths, relative to the open blend file */
/* Give a base to loose objects. If group append, do it for objects too.
- * Only directly linked objects & groups are instanciated by
`BLO_library_link_named_part_ex()` & co,
+ * Only directly linked objects & groups are instantiated by
`BLO_library_link_named_part_ex()` & co,
* here we handle indirect ones and other possible edge-cases. */
if (scene) {
give_base_to_objects(mainvar, scene, v3d, curlib, flag);
@@ -9804,7 +9804,7 @@ static void library_link_end(Main *mainl, FileData **fd,
const short flag, Scene
/* printf("library_append_end, scene is NULL (objects wont get
bases)\n"); */
}
- /* clear group instancing tag */
+ /* clear group instantiating tag */
BKE_main_id_tag_listbase(&(mainvar->group), false);
/* patch to prevent switch_endian happens twice */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
