[Bf-blender-cvs] [b46b921] asset-experiments: Merge branch 'id-remap' into asset-experiments

[Bastien Montagne]

Commit: b46b921738186ca0be6f43a5c52fedf7df11573a
Author: Bastien Montagne
Date:   Thu Dec 17 19:39:05 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBb46b921738186ca0be6f43a5c52fedf7df11573a

Merge branch 'id-remap' into asset-experiments

Conflicts:
	source/blender/blenloader/BLO_readfile.h
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 07d2611,5097bf2..9278785
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9772,35 -9767,13 +9772,37 @@@ ID *BLO_library_link_named_part(Main *m
   * \return the linked ID when found.
   */
  ID *BLO_library_link_named_part_ex(
 -        Main *mainl, BlendHandle **bh,
 -        const short idcode, const char *name, const short flag,
 +        Main *mainl, BlendHandle **bh, const short idcode, const char *name, const short flag,
-         Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect)
++        Scene *scene, View3D *v3d,
++        const bool use_placeholders, const bool force_indirect)
 +{
 +	FileData *fd = (FileData*)(*bh);
 +	return link_named_part_ex(mainl, fd, NULL, idcode, name, NULL, flag, scene, v3d, use_placeholders, force_indirect);
 +}
 +
 +/**
 + * Link a named datablock from an external blend file, using given asset engine & asset UUID.
 + * 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 aet The asset engine type (NULL when no asset engine is used).
 + * \param idcode The kind of datablock to link.
 + * \param name The name of the datablock (without the 2 char ID prefix).
 + * \param uuid The asset engine's UUID of this datablock (NULL when no asset engine is used).
 + * \param flag Options for linking, used for instantiating.
 + * \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 instantiated objects & groups, can be NULL).
 + * \return the linked ID when found.
 + */
 +struct ID *BLO_library_link_named_part_asset(
 +        Main *mainl, BlendHandle **bh, const AssetEngineType *aet,
 +        const short idcode, const char *name, const AssetUUID *uuid, const short flag,
-         Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect)
+         Scene *scene, View3D *v3d,
+         const bool use_placeholders, const bool force_indirect)
  {
  	FileData *fd = (FileData*)(*bh);
 -	return link_named_part_ex(mainl, fd, idcode, name, flag, scene, v3d, use_placeholders, force_indirect);
 +	return link_named_part_ex(mainl, fd, aet, idcode, name, uuid, flag, scene, v3d, use_placeholders, force_indirect);
  }
  
  static void link_id_part(ReportList *reports, FileData *fd, Main *mainvar, ID *id, ID **r_id)