diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /extern/carve/include/carve/aabb.hpp | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'extern/carve/include/carve/aabb.hpp')
| -rw-r--r-- | extern/carve/include/carve/aabb.hpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/extern/carve/include/carve/aabb.hpp b/extern/carve/include/carve/aabb.hpp index 20ee028aa45..c2fb2f6075f 100644 --- a/extern/carve/include/carve/aabb.hpp +++ b/extern/carve/include/carve/aabb.hpp @@ -120,6 +120,12 @@ namespace carve { template<unsigned ndim> std::ostream &operator<<(std::ostream &o, const aabb<ndim> &a); + template<unsigned ndim> + double distance2(const aabb<3> &a, const vector<ndim> &v); + + template<unsigned ndim> + double distance(const aabb<3> &a, const vector<ndim> &v); + template<unsigned ndim, typename obj_t> |