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

[Sergey Sharybin]

Commit: aa2ecbf35b26edd22deb1595487ef59035d1a16c
Author: Sergey Sharybin
Date:   Wed Nov 29 16:00:50 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBaa2ecbf35b26edd22deb1595487ef59035d1a16c

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_group.h
index 9aab6950496,e07dd259970..1d35e6ab9fc
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@@ -52,7 -52,6 +52,6 @@@ bool          BKE_group_object_exists(s
  bool          BKE_group_object_cyclic_check(struct Main *bmain, struct Object *object, struct Group *group);
  bool          BKE_group_is_animated(struct Group *group, struct Object *parent);
  
- void          BKE_group_tag_recalc(struct Group *group);
 -void          BKE_group_handle_recalc_and_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *parent, struct Group *group);
 +void          BKE_group_handle_recalc_and_update(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *parent, struct Group *group);
  
  #endif  /* __BKE_GROUP_H__ */