[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48093] branches/soc-2012-bratwurst/source /blender/assimp: - bf_assimp: forgot GPL head on AnimEvaluator.h/cpp (note: being co-owner of that code in assimp, I can confirm that the re-labeling from bsd to gpl is ok :-) - it' s a highly modified version anyway).

[Alexander Gessler]

Revision: 48093
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48093
Author:   aramis_acg
Date:     2012-06-19 18:07:13 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
- bf_assimp: forgot GPL head on AnimEvaluator.h/cpp (note: being co-owner of that code in assimp, I can confirm that the re-labeling from bsd to gpl is ok :-) - it's a highly modified version anyway).

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.cpp
    branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.h

Modified: branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.cpp	2012-06-19 18:04:40 UTC (rev 48092)
+++ branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.cpp	2012-06-19 18:07:13 UTC (rev 48093)
@@ -1,44 +1,33 @@
 /*
----------------------------------------------------------------------------
-Open Asset Import Library (assimp)
----------------------------------------------------------------------------
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Thomas Schulze, Alexander Gessler
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
 
-Copyright (c) 2006-2012, assimp team
+/** \file blender/assimp/AnimEvaluator.cpp
+ *  \ingroup assimp
+ *
+ *  Note: this is a slightly modified version of assimpview's 
+ *  animation code (assimp_repos/tools/assimp_view/AnimEvaluator.cpp)
+ */
 
-All rights reserved.
 
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the following 
-conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------
-*/
-
 #include "AnimEvaluator.h"
 
 namespace bassimp {

Modified: branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.h	2012-06-19 18:04:40 UTC (rev 48092)
+++ branches/soc-2012-bratwurst/source/blender/assimp/AnimEvaluator.h	2012-06-19 18:07:13 UTC (rev 48093)
@@ -1,44 +1,33 @@
 /*
----------------------------------------------------------------------------
-Open Asset Import Library (assimp)
----------------------------------------------------------------------------
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Thomas Schulze, Alexander Gessler
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
 
-Copyright (c) 2006-2012, assimp team
+/** \file blender/assimp/AnimEvaluator.h
+ *  \ingroup assimp
+ *
+ *  Note: this is a slightly modified version of assimpview's 
+ *  animation code (assimp_repos/tools/assimp_view/AnimEvaluator.h)
+ */
 
-All rights reserved.
 
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the following 
-conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------
-*/
-
 /** Calculates a pose for a given time of an animation */
 
 #ifndef INCLUDED_ANIM_EVALUATOR_H