Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 13:57:59 +0000 (15:57 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 13:57:59 +0000 (15:57 +0200)
1  2 
GNUmakefile
build_files/build_environment/install_deps.sh
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_window.c

diff --cc GNUmakefile
Simple merge
index 23bd2a7bb166b0df289ac9e74a8f29b73d8aba7d,1794d74576738b9a01c299acef0e78475e273cde..8dad3a2036e51d6529b41603600ae18d60c812a9
@@@ -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++;