diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-02 03:37:52 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-02 03:37:52 +0400 |
commit | a5692fd67bedf71f849d330c83239a47ad93e3e7 (patch) | |
tree | 8e0ee63a3c9075dee1d50c14795658896c69adf4 /source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | |
parent | 4cfdedbe6167d8c3a596bde24dde23ce578b1764 (diff) | |
parent | c92e3225f3aa5fadb9ad0920dffbdc0c0209a98a (diff) |
Merged changes in the trunk up to revision 30952.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 4c6ea48f692..91c0cca76c9 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -50,7 +50,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) lb = freestyle_scene->r.layers; freestyle_scene->r= old_scene->r; freestyle_scene->r.layers= lb; - set_scene_bg( freestyle_scene ); + set_scene_bg( G.main, freestyle_scene ); // image dimensions float ycor = ((float)re->r.yasp) / ((float)re->r.xasp); @@ -127,7 +127,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer(){ // release material free_libblock( &G.main->mat, material ); - set_scene_bg( old_scene ); + set_scene_bg( G.main, old_scene ); } float BlenderStrokeRenderer::get_stroke_vertex_z(void) const { @@ -336,6 +336,6 @@ Render* BlenderStrokeRenderer::RenderScene( Render *re ) { Render *freestyle_render = RE_NewRender(freestyle_scene->id.name); - RE_RenderFreestyleStrokes(freestyle_render, freestyle_scene); + RE_RenderFreestyleStrokes(freestyle_render, G.main, freestyle_scene); return freestyle_render; } |