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

[Campbell Barton]

Commit: 9d57b5aa44ffccd95a3f43e60a5aa73d657e9041
Author: Campbell Barton
Date:   Mon Jun 18 07:34:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9d57b5aa44ffccd95a3f43e60a5aa73d657e9041

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 22986205eef,c30107881f7..8d60e96ef01
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -5125,8 -6194,16 +5128,9 @@@ static void rna_def_scene_render_data(B
  	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
  	RNA_def_property_ui_text(prop, "Movie Format", "When true the format is a movie");
  
 -	prop = RNA_def_property(srna, "use_free_image_textures", PROP_BOOLEAN, PROP_NONE);
 -	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE);
 -	RNA_def_property_ui_text(prop, "Free Image Textures",
 -	                         "Free all image textures from memory after render, to save memory before compositing");
 -	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
 -
  	prop = RNA_def_property(srna, "use_save_buffers", PROP_BOOLEAN, PROP_NONE);
  	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE);
+ 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 -	RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_save_buffers_get", NULL);
  	RNA_def_property_ui_text(prop, "Save Buffers",
  	                         "Save tiles for all RenderLayers and SceneNodes to files in the temp directory "
  	                         "(saves memory, required for Full Sample)");