Commit: b98f76cd90a14d500fb9a059b95aa32c3ab9e6e4
Author: Irie Shinsuke
Date: Sun Nov 4 20:34:02 2018 +0100
Branches: master
https://developer.blender.org/rBb98f76cd90a14d500fb9a059b95aa32c3ab9e6e4
Fix T57388: Blender Internal + Freestyle viewport render wrongly using FSAA.
===================================================================
M
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 9c3ff8999b7..0b672ca6adb 100644
---
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -96,7 +96,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int
render_count) : Str
//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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
