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

[Bastien Montagne]

Commit: 4a4c6da0f8aaf94dff8d219770404c46760cce15
Author: Bastien Montagne
Date:   Thu Aug 10 15:57:59 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4a4c6da0f8aaf94dff8d219770404c46760cce15

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library_remap.c
index 23bd2a7bb16,1794d745767..8dad3a2036e
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -248,9 -241,9 +248,9 @@@ static int foreach_libblock_remap_callb
  	return IDWALK_RET_NOP;
  }
  
- /* Some reamapping unfortunately require extra and/or specific handling, tackle those here. */
+ /* Some remapping unfortunately require extra and/or specific handling, tackle those here. */
  static void libblock_remap_data_preprocess_scene_base_unlink(
 -        IDRemap *r_id_remap_data, Scene *sce, Base *base, const bool skip_indirect, const bool is_indirect)
 +        IDRemap *r_id_remap_data, Scene *sce, BaseLegacy *base, const bool skip_indirect, const bool is_indirect)
  {
  	if (skip_indirect && is_indirect) {
  		r_id_remap_data->skipped_indirect++;