diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-01-30 01:13:39 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-01-30 01:13:39 +0300 |
commit | 446af11fb39a78fc2ebeac3fc539baf61778420d (patch) | |
tree | a47089678039ebbca2314cddb7b58338695a4876 /source/blender/freestyle | |
parent | c5558e696714e2f5e931a06677024c54d8099d15 (diff) |
Fixed a bug that caused a Y-direction offset in rendering results.
The renderer now takes the aspect ratio settings into account.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 3 | ||||
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index aa268e7a265..78696a9d39e 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -52,8 +52,9 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re) set_scene_bg( freestyle_scene ); // image dimensions + float ycor = ((float)re->r.yasp) / ((float)re->r.xasp); float width = freestyle_scene->r.xsch; - float height = freestyle_scene->r.ysch; + float height = freestyle_scene->r.ysch * ycor; // Camera Object* object_camera = add_object(freestyle_scene, OB_CAMERA); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 4ef3abe54d8..df54ca68f03 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -81,8 +81,9 @@ extern "C" { //======================================================= void init_view(Render* re){ + float ycor = ((float)re->r.yasp) / ((float)re->r.xasp); int width = re->scene->r.xsch; - int height = re->scene->r.ysch; + int height = (int)(((float)re->scene->r.ysch) * ycor); freestyle_viewport[0] = freestyle_viewport[1] = 0; freestyle_viewport[2] = width; @@ -168,10 +169,12 @@ extern "C" { rl = render_get_active_layer( freestyle_render, freestyle_render->result ); if( !rl || rl->rectf == NULL) { cout << "Cannot find Freestyle result image" << endl; return; } src = rl->rectf; + //cout << "src: " << rl->rectx << " x " << rl->recty << endl; rl = RE_GetRenderLayer(re->result, srl->name); if( !rl || rl->rectf == NULL) { cout << "No layer to composite to" << endl; return; } dest = rl->rectf; + //cout << "dest: " << rl->rectx << " x " << rl->recty << endl; rectx = re->rectx; recty = re->recty; |