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

[Bastien Montagne]

Commit: b8d376174ca9b372a978c997a25ebf2ff31a9df0
Author: Bastien Montagne
Date:   Wed Feb 7 22:19:11 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBb8d376174ca9b372a978c997a25ebf2ff31a9df0

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/windowmanager/intern/wm_files_link.c

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



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

diff --cc source/blender/windowmanager/intern/wm_files_link.c
index dc6d22b58d5,171863454d9..fec4d51dbd8
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@@ -359,8 -318,7 +356,8 @@@ static int wm_link_append_exec(bContex
  		return OPERATOR_CANCELLED;
  	}
  
- 	flag = wm_link_append_flag(op);
- 	do_append = (flag & FILE_LINK) == 0;
+ 	short flag = wm_link_append_flag(op);
++	const bool do_append = (flag & FILE_LINK) == 0;
  
  	/* sanity checks for flag */
  	if (scene && scene->id.lib) {