[Bf-blender-cvs] [7439919ac0c] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb
Author: Bastien Montagne
Date:   Wed Jun 14 22:39:33 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB7439919ac0c4b0146cfed0ddbb8b945fe3675bcb

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_group.h
index f718e9c8555,684251c9561..4555bbf076d
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@@ -43,10 -42,10 +43,10 @@@ struct Scene
  
  void          BKE_group_free(struct Group *group);
  struct Group *BKE_group_add(struct Main *bmain, const char *name);
- struct Group *BKE_group_copy(struct Main *bmain, struct Group *group);
+ struct Group *BKE_group_copy(struct Main *bmain, const struct Group *group);
  void          BKE_group_make_local(struct Main *bmain, struct Group *group, const bool lib_local);
 -bool          BKE_group_object_add(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
 -bool          BKE_group_object_unlink(struct Group *group, struct Object *ob, struct Scene *scene, struct Base *base);
 +bool          BKE_group_object_add(struct Group *group, struct Object *ob);
 +bool          BKE_group_object_unlink(struct Group *group, struct Object *ob);
  struct Group *BKE_group_object_find(struct Group *group, struct Object *ob);
  bool          BKE_group_object_exists(struct Group *group, struct Object *ob);
  bool          BKE_group_object_cyclic_check(struct Main *bmain, struct Object *object, struct Group *group);
diff --cc source/blender/blenkernel/BKE_object.h
index 6bc2706c685,0a5035f9a9b..2aa7829c9df
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -102,12 -101,12 +102,12 @@@ void BKE_object_lod_add(struct Object *
  void BKE_object_lod_sort(struct Object *ob);
  bool BKE_object_lod_remove(struct Object *ob, int level);
  void BKE_object_lod_update(struct Object *ob, const float camera_position[3]);
 -bool BKE_object_lod_is_usable(struct Object *ob, struct Scene *scene);
 -struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct Scene *scene);
 -struct Object *BKE_object_lod_matob_get(struct Object *ob, struct Scene *scene);
 +bool BKE_object_lod_is_usable(struct Object *ob, struct SceneLayer *sl);
 +struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct SceneLayer *sl);
 +struct Object *BKE_object_lod_matob_get(struct Object *ob, struct SceneLayer *sl);
  
- struct Object *BKE_object_copy_ex(struct Main *bmain, struct Object *ob, bool copy_caches);
- struct Object *BKE_object_copy(struct Main *bmain, struct Object *ob);
+ struct Object *BKE_object_copy_ex(struct Main *bmain, const struct Object *ob, bool copy_caches);
+ struct Object *BKE_object_copy(struct Main *bmain, const struct Object *ob);
  void BKE_object_make_local(struct Main *bmain, struct Object *ob, const bool lib_local);
  void BKE_object_make_local_ex(struct Main *bmain, struct Object *ob, const bool lib_local, const bool clear_proxy);
  bool BKE_object_is_libdata(struct Object *ob);