Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 4 Nov 2018 23:30:33 +0000 (00:30 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 4 Nov 2018 23:30:33 +0000 (00:30 +0100)
1  2 
intern/cycles/blender/addon/engine.py
intern/cycles/render/buffers.cpp
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

Simple merge
Simple merge
@@@ -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;