[Bf-blender-cvs] [b25c224] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: b25c224d901c420acf36e2aff9100e6041746a64
Author: Bastien Montagne
Date:   Wed Jun 29 18:01:35 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBb25c224d901c420acf36e2aff9100e6041746a64

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/windowmanager/intern/wm_files_link.c
index 3a57004,12ad8f9..f3792e0
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@@ -351,12 -260,11 +351,12 @@@ static void wm_link_do
  				continue;
  			}
  
 -			new_id = BLO_library_link_named_part_ex(
 -			             mainl, &bh, item->idcode, item->name, flag, scene, v3d, use_placeholders, force_indirect);
 +			new_id = BLO_library_link_named_part_asset(
 +			             mainl, &bh, aet, lapp_data->root, item->idcode, item->name, item->uuid, flag, scene, v3d,
 +			             use_placeholders, force_indirect);
  
  			if (new_id) {
- 				/* If the link is sucessful, clear item's libs 'todo' flags.
+ 				/* If the link is successful, clear item's libs 'todo' flags.
  				 * This avoids trying to link same item with other libraries to come. */
  				BLI_BITMAP_SET_ALL(item->libraries, false, lapp_data->num_libraries);
  				item->new_id = new_id;