[Bf-blender-cvs] [11229c4d413] soc-2018-npr: Merge branch 'master' into soc-2018-npr

[Yiming Wu]

Commit: 11229c4d413720f3658225e3d44329434befa90a
Author: Yiming Wu
Date:   Fri Apr 12 16:33:02 2019 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB11229c4d413720f3658225e3d44329434befa90a

Merge branch 'master' into soc-2018-npr

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 4e0bc325d8f,28ee85373bd..4745b42356b
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -6050,8 -6006,9 +6057,9 @@@ static void rna_def_scene_eevee(Blender
  	RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_TAA_REPROJECTION);
  	RNA_def_property_boolean_default(prop, 1);
  	RNA_def_property_ui_text(prop, "Viewport Denoising", "Denoise image using temporal reprojection "
 -	                                                     "(can leave some ghosting)");
 +	                         "(can leave some ghosting)");
  	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
  
  	/* Screen Space Subsurface Scattering */
  	prop = RNA_def_property(srna, "use_sss", PROP_BOOLEAN, PROP_NONE);
@@@ -6076,8 -6036,9 +6087,9 @@@
  	RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SSS_SEPARATE_ALBEDO);
  	RNA_def_property_boolean_default(prop, 0);
  	RNA_def_property_ui_text(prop, "Separate Albedo", "Avoid albedo being blurred by the subsurface scattering "
 -	                                                  "but uses more video memory");
 +	                         "but uses more video memory");
  	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
  
  	/* Screen Space Reflection */
  	prop = RNA_def_property(srna, "use_ssr", PROP_BOOLEAN, PROP_NONE);
@@@ -6154,8 -6126,9 +6177,9 @@@
  	RNA_def_property_enum_default(prop, 8);
  	RNA_def_property_enum_items(prop, eevee_volumetric_tile_size_items);
  	RNA_def_property_ui_text(prop, "Tile Size", "Control the quality of the volumetric effects "
 -	                                            "(lower size increase vram usage and quality)");
 +	                         "(lower size increase vram usage and quality)");
  	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
  
  	prop = RNA_def_property(srna, "volumetric_samples", PROP_INT, PROP_NONE);
  	RNA_def_property_int_default(prop, 64);
@@@ -6209,8 -6190,9 +6241,9 @@@
  	RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_GTAO_BOUNCE);
  	RNA_def_property_boolean_default(prop, 1);
  	RNA_def_property_ui_text(prop, "Bounces Approximation", "An approximation to simulate light bounces "
 -	                                                        "giving less occlusion on brighter objects");
 +	                         "giving less occlusion on brighter objects");
  	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
  
  	prop = RNA_def_property(srna, "gtao_factor", PROP_FLOAT, PROP_FACTOR);
  	RNA_def_property_float_default(prop, 1.0f);