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

[Campbell Barton]

Commit: 71466cac1efae5e942596ec25c8787478f8356b0
Author: Campbell Barton
Date:   Mon Oct 22 14:59:12 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB71466cac1efae5e942596ec25c8787478f8356b0

Merge branch 'master' into blender2.8

Reverts: 92fd931e536

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index 1195348ed0d,6182a8c5ec6..7d3599b2f11
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -2166,7 -2092,8 +2166,8 @@@ static int wm_save_as_mainfile_exec(bCo
  {
  	Main *bmain = CTX_data_main(C);
  	char path[FILE_MAX];
 -	int fileflags;
 +	int fileflags, orig_fileflags;
+ 	const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke);
  
  	save_set_compress(op);