diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-26 17:11:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-26 17:11:55 +0400 |
| commit | b6569ee4e75de0a68d05278eee6fb10ecc3d7183 (patch) | |
| tree | bd0304a2f9c387c4989901058848ffb9b534f0f0 /source/blender/freestyle/intern/blender_interface | |
| parent | 9bd9b7e958b86f4dda24d6d2af3bf42a751cd79a (diff) | |
| parent | df22957bfce70b704b6b93958814c1ca8b2211f5 (diff) | |
Merged changes in the trunk up to revision 42116.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 4 |
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 01d416e46be..103255d28d1 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -78,8 +78,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) freestyle_scene->r.gauss= old_scene->r.gauss; freestyle_scene->r.dither_intensity= old_scene->r.dither_intensity; BLI_strncpy(freestyle_scene->r.engine, old_scene->r.engine, sizeof(freestyle_scene->r.engine)); - freestyle_scene->r.planes = R_PLANES32; - freestyle_scene->r.imtype = R_PNG; + freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; + freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; set_scene_bg( G.main, freestyle_scene ); // Camera |