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:
authorMaxime Curioni <maxime.curioni@gmail.com>2009-04-12 11:12:59 +0400
committerMaxime Curioni <maxime.curioni@gmail.com>2009-04-12 11:12:59 +0400
commite7f3a3d93a79ac57525ecc2735e5a33cb1757ca7 (patch)
tree0439b5eb6153e83611c3fb8e072677bbc774a79f /source/blender/freestyle/intern
parent452593a05382399f6cfc6c958aeb9ebffe4b9d15 (diff)
Simplified modelview matrix copy (take 2)
Diffstat (limited to 'source/blender/freestyle/intern')
-rwxr-xr-xsource/blender/freestyle/intern/app_blender/Controller.cpp14
-rw-r--r--source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp4
2 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index c54e68de381..adca0173096 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -406,31 +406,31 @@ void Controller::ComputeViewMap()
// 3D context is on.
Vec3r vp( freestyle_viewpoint[0], freestyle_viewpoint[1], freestyle_viewpoint[2]);
- cout << "mv" << endl;
+ //cout << "mv" << endl;
real mv[4][4];
for( int i= 0; i < 4; i++) {
for( int j= 0; j < 4; j++) {
mv[i][j] = freestyle_mv[i][j];
- cout << mv[i][j] << " ";
+ //cout << mv[i][j] << " ";
}
- cout << endl;
+ // cout << endl;
}
- cout << "\nproj" << endl;
+ //cout << "\nproj" << endl;
real proj[4][4];
for( int i= 0; i < 4; i++) {
for( int j= 0; j < 4; j++) {
proj[i][j] = freestyle_proj[i][j];
- cout << proj[i][j] << " ";
+ //cout << proj[i][j] << " ";
}
- cout << endl;
+ //cout << endl;
}
int viewport[4];
for( int i= 0; i < 4; i++)
viewport[i] = freestyle_viewport[i];
- cout << "\nfocal:" << _pView->GetFocalLength() << endl << endl;
+ //cout << "\nfocal:" << _pView->GetFocalLength() << endl << endl;
diff --git a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
index 86478e6ea11..c65d71452a7 100644
--- a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp
@@ -119,9 +119,7 @@ extern "C" {
void init_camera(Render* re){
Object* maincam_obj = re->scene->camera;
- Camera *cam = (Camera*) maincam_obj->data;
-
- //view->setHorizontalFov( cam->angle );
+ // Camera *cam = (Camera*) maincam_obj->data;
freestyle_viewpoint[0] = maincam_obj->obmat[3][0];
freestyle_viewpoint[1] = maincam_obj->obmat[3][1];