Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-02-13 04:13:16 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-02-13 04:13:16 +0300
commit135a944c66c57f11fd77b4f7231686353112e7ac (patch)
tree3928c457f44f544113e84b3356ab101e3820072e /source/blender/freestyle
parent1b3948f9aad25fec1923f5ccd36ea525d8e34fb6 (diff)
parent33b1cbf06d2c822c68676390b1775eb5d78de6e6 (diff)
Merged changes in the trunk up to revision 26856.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index a220340efcc..05c23678acd 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -336,7 +336,7 @@ Render* BlenderStrokeRenderer::RenderScene( Render *re ) {
freestyle_scene->r.imtype = R_PNG;
// Pass 1 - render only the alpha component
- freestyle_render = RE_NewRender(freestyle_scene->id.name);
+ freestyle_render = RE_NewRender(freestyle_scene->id.name, RE_SLOT_DEFAULT);
RE_BlenderFrame( freestyle_render, freestyle_scene, NULL, 1);
// save the alpha component of the render into a buffer
@@ -378,7 +378,7 @@ Render* BlenderStrokeRenderer::RenderScene( Render *re ) {
}
// Pass 2 - render the RGB components
- freestyle_render = RE_NewRender(freestyle_scene->id.name);
+ freestyle_render = RE_NewRender(freestyle_scene->id.name, RE_SLOT_DEFAULT);
RE_BlenderFrame( freestyle_render, freestyle_scene, NULL, 1);
// merge the saved alpha component into the 2nd render