Commit: 99bb1accbbb8e1ba38f30b073b22deb107bf3220
Author: Bastien Montagne
Date: Tue Jul 12 09:15:49 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rB99bb1accbbb8e1ba38f30b073b22deb107bf3220
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index fc3ef00,059dce2..2f7b138
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -115,8 -113,6 +115,7 @@@
#include "BKE_action.h"
#include "BKE_armature.h"
+#include "BKE_asset.h"
- #include "BKE_blender_version.h"
#include "BKE_brush.h"
#include "BKE_cloth.h"
#include "BKE_constraint.h"
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;
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 4d5156f,3022d86..1de92c0
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -40,9 -40,7 +40,10 @@@
#include "MEM_guardedalloc.h"
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+ #include "DNA_genfile.h"
#include "DNA_scene_types.h"
#include "DNA_userdef_types.h"
#include "DNA_windowmanager_types.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
