[Bf-blender-cvs] [498b712] asset-experiments: Merge branch 'asset-engine' into asset-experiments

[Bastien Montagne]

Commit: 498b712a37bceaa865ee2db66c4e89b09b3251cb
Author: Bastien Montagne
Date:   Thu Jan 14 20:32:03 2016 +0100
Branches: asset-experiments
https://developer.blender.org/rB498b712a37bceaa865ee2db66c4e89b09b3251cb

Merge branch 'asset-engine' into asset-experiments

Conflicts:
	source/blender/windowmanager/intern/wm_operators.c

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



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

diff --cc source/blender/windowmanager/intern/wm_operators.c
index 5dabcf5,14b8123..be9e522
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -2552,8 -2557,7 +2558,8 @@@ static void wm_link_do
  			}
  
  			new_id = BLO_library_link_named_part_asset(
- 			             mainl, &bh, aet, item->idcode, item->name, &item->uuid, flag, scene, v3d,
 -			             mainl, &bh, aet, item->idcode, item->name, item->uuid, flag, scene, v3d);
++			             mainl, &bh, aet, 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.