[Bf-blender-cvs] [25c3a00] opensubdiv-modifier: OpenSubdiv: Update header, it's now purely ours

[Sergey Sharybin]

Commit: 25c3a00f6e9ba0de2845f5ba939bd533a46d8f3b
Author: Sergey Sharybin
Date:   Tue Jul 22 16:49:36 2014 +0600
Branches: opensubdiv-modifier
https://developer.blender.org/rB25c3a00f6e9ba0de2845f5ba939bd533a46d8f3b

OpenSubdiv: Update header, it's now purely ours

===================================================================

M	intern/opensubdiv/opensubdiv_gpu_capi.cc

===================================================================

diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index c7ead60..02824ea 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -1,32 +1,26 @@
 /*
- * Adapted from OpenSubdiv with this license:
+ * ***** BEGIN GPL LICENSE BLOCK *****
  *
- *   Copyright 2013 Pixar
+ * 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.
  *
- *   Licensed under the Apache License, Version 2.0 (the "Apache License")
- *   with the following modification; you may not use this file except in
- *   compliance with the Apache License and the following modification to it:
- *   Section 6. Trademarks. is deleted and replaced with:
+ * 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.
  *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor
- *      and its affiliates, except as required to comply with Section 4(c) of
- *      the License and to reproduce the content of the NOTICE file.
+ * 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.
  *
- *   You may obtain a copy of the Apache License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the Apache License with the above modification is
- *   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied. See the Apache License for the specific
- *   language governing permissions and limitations under the Apache License.
- *
- * Modifications Copyright 2014, Blender Foundation.
+ * The Original Code is Copyright (C) 2013 Blender Foundation.
+ * All rights reserved.
  *
  * Contributor(s): Sergey Sharybin
  *
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 /* Do some compatibility hacks in order to make