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-01-10 18:28:24 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-01-10 18:28:24 +0300
commit7b530567ef005e67529f0778a098ab27a560534f (patch)
tree3c8a3e496552af90a915f486a0b81913e0086ce1 /source/blender/freestyle
parent622a65a297b82f6f63baff124f42e02a8f6ef29c (diff)
parent2c56c59dfe30b4a44fe06135aba60b60bc6aa457 (diff)
Merged changes in the trunk up to revision 25863.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index e16568b5cf6..2a29576a981 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -268,6 +268,6 @@ Render* BlenderStrokeRenderer::RenderScene( Render *re ) {
Render* freestyle_render = RE_NewRender(freestyle_scene->id.name);
- RE_BlenderFrame( freestyle_render, freestyle_scene, 1);
+ RE_BlenderFrame( freestyle_render, freestyle_scene, NULL, 1);
return freestyle_render;
}