kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix encoding of those files (was iso-8859-15, i.e 8bit, instead of utf-8!).

Browse Source
This commit is contained in:
Bastien Montagne 2012-12-21 15:41:34 +00:00
parent a462d69bbf
commit 8b57a67f3e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/freestyle/intern/geometry/GeomUtils.cpp
View File

@ -209,7 +209,7 @@ namespace GeomUtils {
} }
// AABB-triangle overlap test code // AABB-triangle overlap test code
// by Tomas Akenine-Möller // by Tomas Akenine-Möller
// Function: int triBoxOverlap(real boxcenter[3], // Function: int triBoxOverlap(real boxcenter[3],
// real boxhalfsize[3],real triverts[3][3]); // real boxhalfsize[3],real triverts[3][3]);
// History: // History:
@ -360,7 +360,7 @@ namespace GeomUtils {
// Fast, Minimum Storage Ray-Triangle Intersection // Fast, Minimum Storage Ray-Triangle Intersection
// //
// Tomas Möller // Tomas Möller
// Prosolvia Clarus AB // Prosolvia Clarus AB
// Sweden // Sweden
// tompa@clarus.se // tompa@clarus.se

4
source/blender/freestyle/intern/geometry/GeomUtils.h
View File

@ -111,14 +111,14 @@ namespace GeomUtils {
const Vec2r& A, const Vec2r& A,
const Vec2r& B); const Vec2r& B);
/*! Box-triangle overlap test, adapted from Tomas Akenine-Möller code */ /*! Box-triangle overlap test, adapted from Tomas Akenine-Möller code */
LIB_GEOMETRY_EXPORT LIB_GEOMETRY_EXPORT
bool overlapTriangleBox(Vec3r& boxcenter, bool overlapTriangleBox(Vec3r& boxcenter,
Vec3r& boxhalfsize, Vec3r& boxhalfsize,
Vec3r triverts[3]); Vec3r triverts[3]);
/*! Fast, Minimum Storage Ray-Triangle Intersection, /*! Fast, Minimum Storage Ray-Triangle Intersection,
* adapted from Tomas Möller and Ben Trumbore code. * adapted from Tomas Möller and Ben Trumbore code.
*/ */
LIB_GEOMETRY_EXPORT LIB_GEOMETRY_EXPORT
bool intersectRayTriangle(const Vec3r& orig, const Vec3r& dir, bool intersectRayTriangle(const Vec3r& orig, const Vec3r& dir,