diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-03-27 10:37:30 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-03-27 10:37:30 +0400 |
| commit | af9573e9eaf9314e9d07575802d34c17bb1091b3 (patch) | |
| tree | 2724acf7c45b2f829407e17a8d766905c1d762cd /extern/bullet/Bullet/CollisionShapes/ConeShape.cpp | |
| parent | 75ce4ca859f7949193015462b5a203137656a7de (diff) | |
Synchronized Bullet physics to latest version.
- Changed license from MIT to ZLib.
- Added 3D Sweep and Prune contribution
- More stable native constraint solver
Sorry for any inconvenience caused by this checkin.
All Blender buildsystems require update: added files and moved files.
Diffstat (limited to 'extern/bullet/Bullet/CollisionShapes/ConeShape.cpp')
| -rw-r--r-- | extern/bullet/Bullet/CollisionShapes/ConeShape.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp b/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp index 07db8822f7e..baf94d16b70 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConeShape.cpp @@ -1,13 +1,18 @@ /* - * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/ - * - * Permission to use, copy, modify, distribute and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies. - * Erwin Coumans makes no representations about the suitability - * of this software for any purpose. - * It is provided "as is" without express or implied warranty. +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. */ + #include "ConeShape.h" #include "SimdPoint3.h" |