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

[Brecht Van Lommel]

Commit: 1e56c8c47deae730269d7d3e48243ae1c79e6153
Author: Brecht Van Lommel
Date:   Mon Nov 5 00:30:33 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB1e56c8c47deae730269d7d3e48243ae1c79e6153

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 610b81c97a5,0b672ca6adb..14b638da545
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@@ -99,8 -93,11 +99,9 @@@ BlenderStrokeRenderer::BlenderStrokeRen
  	freestyle_scene->r.tilex = old_scene->r.tilex;
  	freestyle_scene->r.tiley = old_scene->r.tiley;
  	freestyle_scene->r.size = 100; // old_scene->r.size
 -	//freestyle_scene->r.maximsize = old_scene->r.maximsize; /* DEPRECATED */
 -	freestyle_scene->r.ocres = old_scene->r.ocres;
  	freestyle_scene->r.color_mgt_flag = 0; // old_scene->r.color_mgt_flag;
- 	freestyle_scene->r.scemode = old_scene->r.scemode & ~(R_SINGLE_LAYER | R_NO_FRAME_UPDATE | R_MULTIVIEW);
+ 	freestyle_scene->r.scemode = (old_scene->r.scemode & ~(R_SINGLE_LAYER | R_NO_FRAME_UPDATE | R_MULTIVIEW)) &
+ 	                             (re->r.scemode | ~R_FULL_SAMPLE);
  	freestyle_scene->r.flag = old_scene->r.flag;
  	freestyle_scene->r.threads = old_scene->r.threads;
  	freestyle_scene->r.border.xmin = old_scene->r.border.xmin;