[Bf-blender-cvs] [4efb5bf] soc-2014-shapekey: Merge branch 'master' into soc-2014-shapekey

[Bastien Montagne]

Commit: 4efb5bf5c6296bd84b18b9ecf97cd16b0ea3613a
Author: Bastien Montagne
Date:   Sat Nov 1 22:27:56 2014 +0100
Branches: soc-2014-shapekey
https://developer.blender.org/rB4efb5bf5c6296bd84b18b9ecf97cd16b0ea3613a

Merge branch 'master' into soc-2014-shapekey

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

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



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

diff --cc source/blender/windowmanager/intern/wm_operators.c
index 1483e21,f048562..fd066c4
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -2961,10 -2958,9 +2963,11 @@@ static void WM_OT_save_mainfile(wmOpera
  	
  	WM_operator_properties_filesel(ot, FOLDERFILE | BLENDERFILE, FILE_BLENDER, FILE_SAVE,
  	                               WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
- 	RNA_def_boolean(ot->srna, "compress", 0, "Compress", "Write compressed .blend file");
- 	RNA_def_boolean(ot->srna, "relative_remap", 0, "Remap Relative", "Remap relative paths when saving in a different directory");
+ 	RNA_def_boolean(ot->srna, "compress", false, "Compress", "Write compressed .blend file");
+ 	RNA_def_boolean(ot->srna, "relative_remap", false, "Remap Relative",
+ 	                "Remap relative paths when saving in a different directory");
 +	RNA_def_boolean(ot->srna, "use_shapekey_compat", false, "Legacy ShapeKey Format",
 +	                "Save using legacy ShapeKey format (no compression)");
  }
  
  static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)