[Bf-blender-cvs] [377ab54dadd] id_override_static: Merge branch 'master' into id_override_static

[Bastien Montagne]

Commit: 377ab54daddac6c4dab02f746e5501e30889883c
Author: Bastien Montagne
Date:   Mon Jul 17 12:17:21 2017 +0200
Branches: id_override_static
https://developer.blender.org/rB377ab54daddac6c4dab02f746e5501e30889883c

Merge branch 'master' into id_override_static

Conflicts:
	source/blender/blenkernel/BKE_library.h

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



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

diff --cc source/blender/blenkernel/BKE_library.h
index 1c4cda3e6cb,258dcc84449..154ff7cb985
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@@ -86,11 -86,10 +86,11 @@@ void BKE_id_clear_newpoin(struct ID *id
  void BKE_id_make_local_generic(struct Main *bmain, struct ID *id, const bool id_in_mainlist, const bool lib_local);
  bool id_make_local(struct Main *bmain, struct ID *id, const bool test, const bool force_local);
  bool id_single_user(struct bContext *C, struct ID *id, struct PointerRNA *ptr, struct PropertyRNA *prop);
- bool id_copy(struct Main *bmain, struct ID *id, struct ID **newid, bool test);
+ bool id_copy(struct Main *bmain, const struct ID *id, struct ID **newid, bool test);
 +void BKE_id_swap(struct ID *id_a, struct ID *id_b);
  void id_sort_by_name(struct ListBase *lb, struct ID *id);
  void BKE_id_expand_local(struct Main *bmain, struct ID *id);
- void BKE_id_copy_ensure_local(struct Main *bmain, struct ID *old_id, struct ID *new_id);
+ void BKE_id_copy_ensure_local(struct Main *bmain, const struct ID *old_id, struct ID *new_id);
  
  bool new_id(struct ListBase *lb, struct ID *id, const char *name);
  void id_clear_lib_data(struct Main *bmain, struct ID *id);