diff options
Diffstat (limited to 'source/blender/freestyle')
9 files changed, 8 insertions, 25 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 930da3ef471..a16479873e7 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -56,11 +56,6 @@ NodeGroup *BlenderFileLoader::Load() // creation of the scene root node _Scene = new NodeGroup; - _viewplane_left = _re->viewplane.xmin; - _viewplane_right = _re->viewplane.xmax; - _viewplane_bottom = _re->viewplane.ymin; - _viewplane_top = _re->viewplane.ymax; - if (_re->clip_start < 0.0f) { // Adjust clipping start/end and set up a Z offset when the viewport preview // is used with the orthographic view. In this case, _re->clip_start is negative, @@ -76,14 +71,6 @@ NodeGroup *BlenderFileLoader::Load() _z_offset = 0.0f; } -#if 0 - if (G.debug & G_DEBUG_FREESTYLE) { - cout << "Frustum: l " << _viewplane_left << " r " << _viewplane_right << " b " - << _viewplane_bottom << " t " << _viewplane_top << " n " << _z_near << " f " << _z_far - << endl; - } -#endif - int id = 0; const eEvaluationMode eval_mode = DEG_get_mode(_depsgraph); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 50834db3c5c..1be2fc3bc99 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -152,10 +152,6 @@ class BlenderFileLoader { real _minEdgeSize; #endif bool _smooth; /* if true, face smoothness is taken into account */ - float _viewplane_left; - float _viewplane_right; - float _viewplane_bottom; - float _viewplane_top; float _z_near, _z_far; float _z_offset; diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index 51727fd2288..d3a3d8bc76e 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -435,12 +435,12 @@ bool overlapTriangleBox(Vec3r &boxcenter, Vec3r &boxhalfsize, Vec3r triverts[3]) // Tomas Möller // Prosolvia Clarus AB // Sweden -// tompa@clarus.se +// <tompa@clarus.se> // // Ben Trumbore // Cornell University // Ithaca, New York -// wbt@graphics.cornell.edu +// <wbt@graphics.cornell.edu> bool intersectRayTriangle(const Vec3r &orig, const Vec3r &dir, const Vec3r &v0, diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 5b5d9582e8f..95a24d85677 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -17,7 +17,7 @@ * GXML/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000 Bruno Levy * Contact: Bruno Levy - * levy@loria.fr + * <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 diff --git a/source/blender/freestyle/intern/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h index 8a20cb31300..8c2eb799d13 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.h +++ b/source/blender/freestyle/intern/geometry/matrix_util.h @@ -17,7 +17,7 @@ * GXML/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000 Bruno Levy * Contact: Bruno Levy - * levy@loria.fr + * <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp index 01d52646eb0..2310525a1e1 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp +++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp @@ -17,7 +17,7 @@ * OGF/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000 Bruno Levy * Contact: Bruno Levy - * levy@loria.fr + * <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 6ac9779e7c2..5adef773be1 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -17,7 +17,7 @@ * OGF/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000 Bruno Levy * Contact: Bruno Levy - * levy@loria.fr + * <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 0ee491a071c..1984aceb51c 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -19,7 +19,7 @@ * and: * OGF/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000-2003 Bruno Levy - * Contact: Bruno Levy levy@loria.fr + * Contact: Bruno Levy <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h index d73674d02cd..0eefc57c3a2 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.h +++ b/source/blender/freestyle/intern/winged_edge/Curvature.h @@ -19,7 +19,7 @@ * and: * OGF/Graphite: Geometry and Graphics Programming Library + Utilities * Copyright (C) 2000-2003 Bruno Levy - * Contact: Bruno Levy levy@loria.fr + * Contact: Bruno Levy <levy@loria.fr> * ISA Project * LORIA, INRIA Lorraine, * Campus Scientifique, BP 239 |