Fix for full-sample anti-aliasing (FSAA) not working with Freestyle.

Reverted the trunk revision 56136 and part of revision 56127 concerning the local Main
for Freestyle and temporary scene generation for stroke rendering.

The function do_merge_fullsample() in pipeline.c has access to the Scene of each Render,
so that the temporary Scene generated by Freestyle has to be kept for FSAA even after
stroke rendering has been done.  By the same token, the local Main has been moved from
the BlenderStrokeRenderer class to Render.  It is noted that free_all_freestyle_renders()
in pipeline.c is intended to get the temporary Scene of each Render released specifically
taking account of the FSAA case.

1 files changed, 1 insertions, 1 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
index 4a80e8ce7e2..4d34f70f689 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
@@ -54,7 +54,7 @@ public:
 	Render *RenderScene(Render *re);
 
 protected:
-	Main _freestyle_bmain;
+	Main *freestyle_bmain;
 	Scene *old_scene;
 	Scene *freestyle_scene;
 	Material *material;