[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59237] trunk/blender/intern/cycles: Cycles: relicense GNU GPL source code to Apache version 2.0.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Aug 18 16:16:15 CEST 2013
Revision: 59237
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59237
Author: blendix
Date: 2013-08-18 14:16:15 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Cycles: relicense GNU GPL source code to Apache version 2.0.
More information in this post:
http://code.blender.org/
Thanks to all contributes for giving their permission!
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_server.cpp
trunk/blender/intern/cycles/app/cycles_test.cpp
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/app/cycles_xml.h
trunk/blender/intern/cycles/app/io_export_cycles_xml.py
trunk/blender/intern/cycles/blender/CCL_api.h
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/engine.py
trunk/blender/intern/cycles/blender/addon/osl.py
trunk/blender/intern/cycles/blender/addon/presets.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/blender_camera.cpp
trunk/blender/intern/cycles/blender/blender_curves.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_object.cpp
trunk/blender/intern/cycles/blender/blender_particles.cpp
trunk/blender/intern/cycles/blender/blender_python.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_session.h
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_sync.h
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/intern/cycles/device/device.cpp
trunk/blender/intern/cycles/device/device.h
trunk/blender/intern/cycles/device/device_cpu.cpp
trunk/blender/intern/cycles/device/device_cuda.cpp
trunk/blender/intern/cycles/device/device_intern.h
trunk/blender/intern/cycles/device/device_memory.h
trunk/blender/intern/cycles/device/device_multi.cpp
trunk/blender/intern/cycles/device/device_network.cpp
trunk/blender/intern/cycles/device/device_network.h
trunk/blender/intern/cycles/device/device_opencl.cpp
trunk/blender/intern/cycles/device/device_task.cpp
trunk/blender/intern/cycles/device/device_task.h
trunk/blender/intern/cycles/doc/license/CMakeLists.txt
trunk/blender/intern/cycles/doc/license/readme.txt
trunk/blender/intern/cycles/kernel/closure/bsdf.h
trunk/blender/intern/cycles/kernel/closure/bsdf_oren_nayar.h
trunk/blender/intern/cycles/kernel/closure/bssrdf.h
trunk/blender/intern/cycles/kernel/closure/volume.h
trunk/blender/intern/cycles/kernel/kernel.cl
trunk/blender/intern/cycles/kernel/kernel.cpp
trunk/blender/intern/cycles/kernel/kernel.cu
trunk/blender/intern/cycles/kernel/kernel.h
trunk/blender/intern/cycles/kernel/kernel_accumulate.h
trunk/blender/intern/cycles/kernel/kernel_camera.h
trunk/blender/intern/cycles/kernel/kernel_compat_cpu.h
trunk/blender/intern/cycles/kernel/kernel_compat_cuda.h
trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h
trunk/blender/intern/cycles/kernel/kernel_curve.h
trunk/blender/intern/cycles/kernel/kernel_differential.h
trunk/blender/intern/cycles/kernel/kernel_displace.h
trunk/blender/intern/cycles/kernel/kernel_emission.h
trunk/blender/intern/cycles/kernel/kernel_film.h
trunk/blender/intern/cycles/kernel/kernel_globals.h
trunk/blender/intern/cycles/kernel/kernel_jitter.h
trunk/blender/intern/cycles/kernel/kernel_light.h
trunk/blender/intern/cycles/kernel/kernel_math.h
trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
trunk/blender/intern/cycles/kernel/kernel_object.h
trunk/blender/intern/cycles/kernel/kernel_passes.h
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/kernel_primitive.h
trunk/blender/intern/cycles/kernel/kernel_random.h
trunk/blender/intern/cycles/kernel/kernel_shader.h
trunk/blender/intern/cycles/kernel/kernel_sse2.cpp
trunk/blender/intern/cycles/kernel/kernel_sse3.cpp
trunk/blender/intern/cycles/kernel/kernel_subsurface.h
trunk/blender/intern/cycles/kernel/kernel_textures.h
trunk/blender/intern/cycles/kernel/kernel_triangle.h
trunk/blender/intern/cycles/kernel/kernel_types.h
trunk/blender/intern/cycles/kernel/osl/osl_globals.h
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/intern/cycles/kernel/osl/osl_services.h
trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
trunk/blender/intern/cycles/kernel/osl/osl_shader.h
trunk/blender/intern/cycles/kernel/shaders/node_add_closure.osl
trunk/blender/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
trunk/blender/intern/cycles/kernel/shaders/node_attribute.osl
trunk/blender/intern/cycles/kernel/shaders/node_background.osl
trunk/blender/intern/cycles/kernel/shaders/node_blackbody.osl
trunk/blender/intern/cycles/kernel/shaders/node_brick_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl
trunk/blender/intern/cycles/kernel/shaders/node_bump.osl
trunk/blender/intern/cycles/kernel/shaders/node_camera.osl
trunk/blender/intern/cycles/kernel/shaders/node_checker_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_color.h
trunk/blender/intern/cycles/kernel/shaders/node_combine_hsv.osl
trunk/blender/intern/cycles/kernel/shaders/node_combine_rgb.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_color.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_float.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_int.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_normal.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_point.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_string.osl
trunk/blender/intern/cycles/kernel/shaders/node_convert_from_vector.osl
trunk/blender/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_emission.osl
trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_fresnel.h
trunk/blender/intern/cycles/kernel/shaders/node_fresnel.osl
trunk/blender/intern/cycles/kernel/shaders/node_gamma.osl
trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl
trunk/blender/intern/cycles/kernel/shaders/node_glass_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_hair_info.osl
trunk/blender/intern/cycles/kernel/shaders/node_holdout.osl
trunk/blender/intern/cycles/kernel/shaders/node_hsv.osl
trunk/blender/intern/cycles/kernel/shaders/node_image_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_invert.osl
trunk/blender/intern/cycles/kernel/shaders/node_layer_weight.osl
trunk/blender/intern/cycles/kernel/shaders/node_light_falloff.osl
trunk/blender/intern/cycles/kernel/shaders/node_light_path.osl
trunk/blender/intern/cycles/kernel/shaders/node_magic_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_mapping.osl
trunk/blender/intern/cycles/kernel/shaders/node_math.osl
trunk/blender/intern/cycles/kernel/shaders/node_mix.osl
trunk/blender/intern/cycles/kernel/shaders/node_mix_closure.osl
trunk/blender/intern/cycles/kernel/shaders/node_musgrave_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_noise_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_normal.osl
trunk/blender/intern/cycles/kernel/shaders/node_normal_map.osl
trunk/blender/intern/cycles/kernel/shaders/node_object_info.osl
trunk/blender/intern/cycles/kernel/shaders/node_output_displacement.osl
trunk/blender/intern/cycles/kernel/shaders/node_output_surface.osl
trunk/blender/intern/cycles/kernel/shaders/node_output_volume.osl
trunk/blender/intern/cycles/kernel/shaders/node_particle_info.osl
trunk/blender/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_rgb_curves.osl
trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl
trunk/blender/intern/cycles/kernel/shaders/node_separate_hsv.osl
trunk/blender/intern/cycles/kernel/shaders/node_separate_rgb.osl
trunk/blender/intern/cycles/kernel/shaders/node_set_normal.osl
trunk/blender/intern/cycles/kernel/shaders/node_sky_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
trunk/blender/intern/cycles/kernel/shaders/node_tangent.osl
trunk/blender/intern/cycles/kernel/shaders/node_texture.h
trunk/blender/intern/cycles/kernel/shaders/node_texture_coordinate.osl
trunk/blender/intern/cycles/kernel/shaders/node_toon_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_value.osl
trunk/blender/intern/cycles/kernel/shaders/node_vector_curves.osl
trunk/blender/intern/cycles/kernel/shaders/node_vector_math.osl
trunk/blender/intern/cycles/kernel/shaders/node_vector_transform.osl
trunk/blender/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_voronoi_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl
trunk/blender/intern/cycles/kernel/shaders/node_wave_texture.osl
trunk/blender/intern/cycles/kernel/shaders/node_wavelength.osl
trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
trunk/blender/intern/cycles/kernel/shaders/oslutil.h
trunk/blender/intern/cycles/kernel/svm/svm.h
trunk/blender/intern/cycles/kernel/svm/svm_attribute.h
trunk/blender/intern/cycles/kernel/svm/svm_brick.h
trunk/blender/intern/cycles/kernel/svm/svm_brightness.h
trunk/blender/intern/cycles/kernel/svm/svm_camera.h
trunk/blender/intern/cycles/kernel/svm/svm_checker.h
trunk/blender/intern/cycles/kernel/svm/svm_closure.h
trunk/blender/intern/cycles/kernel/svm/svm_convert.h
trunk/blender/intern/cycles/kernel/svm/svm_displace.h
trunk/blender/intern/cycles/kernel/svm/svm_fresnel.h
trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
trunk/blender/intern/cycles/kernel/svm/svm_geometry.h
trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
trunk/blender/intern/cycles/kernel/svm/svm_hsv.h
trunk/blender/intern/cycles/kernel/svm/svm_image.h
trunk/blender/intern/cycles/kernel/svm/svm_invert.h
trunk/blender/intern/cycles/kernel/svm/svm_light_path.h
trunk/blender/intern/cycles/kernel/svm/svm_magic.h
trunk/blender/intern/cycles/kernel/svm/svm_mapping.h
trunk/blender/intern/cycles/kernel/svm/svm_math.h
trunk/blender/intern/cycles/kernel/svm/svm_mix.h
trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h
trunk/blender/intern/cycles/kernel/svm/svm_noisetex.h
trunk/blender/intern/cycles/kernel/svm/svm_normal.h
trunk/blender/intern/cycles/kernel/svm/svm_ramp.h
trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
trunk/blender/intern/cycles/kernel/svm/svm_sky.h
trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/intern/cycles/kernel/svm/svm_types.h
trunk/blender/intern/cycles/kernel/svm/svm_value.h
trunk/blender/intern/cycles/kernel/svm/svm_vector_transform.h
trunk/blender/intern/cycles/kernel/svm/svm_voronoi.h
trunk/blender/intern/cycles/kernel/svm/svm_wave.h
trunk/blender/intern/cycles/render/attribute.cpp
trunk/blender/intern/cycles/render/attribute.h
trunk/blender/intern/cycles/render/background.cpp
trunk/blender/intern/cycles/render/background.h
trunk/blender/intern/cycles/render/blackbody.h
trunk/blender/intern/cycles/render/bssrdf.cpp
trunk/blender/intern/cycles/render/bssrdf.h
trunk/blender/intern/cycles/render/buffers.cpp
trunk/blender/intern/cycles/render/buffers.h
trunk/blender/intern/cycles/render/camera.cpp
trunk/blender/intern/cycles/render/camera.h
trunk/blender/intern/cycles/render/curves.cpp
trunk/blender/intern/cycles/render/curves.h
trunk/blender/intern/cycles/render/film.cpp
trunk/blender/intern/cycles/render/film.h
trunk/blender/intern/cycles/render/graph.cpp
trunk/blender/intern/cycles/render/graph.h
trunk/blender/intern/cycles/render/image.cpp
trunk/blender/intern/cycles/render/image.h
trunk/blender/intern/cycles/render/integrator.cpp
trunk/blender/intern/cycles/render/integrator.h
trunk/blender/intern/cycles/render/light.cpp
trunk/blender/intern/cycles/render/light.h
trunk/blender/intern/cycles/render/mesh.cpp
trunk/blender/intern/cycles/render/mesh.h
trunk/blender/intern/cycles/render/mesh_displace.cpp
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/intern/cycles/render/object.cpp
trunk/blender/intern/cycles/render/object.h
trunk/blender/intern/cycles/render/osl.cpp
trunk/blender/intern/cycles/render/osl.h
trunk/blender/intern/cycles/render/particles.cpp
trunk/blender/intern/cycles/render/particles.h
trunk/blender/intern/cycles/render/scene.cpp
trunk/blender/intern/cycles/render/scene.h
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/render/session.h
trunk/blender/intern/cycles/render/shader.cpp
trunk/blender/intern/cycles/render/shader.h
trunk/blender/intern/cycles/render/sobol.h
trunk/blender/intern/cycles/render/svm.cpp
trunk/blender/intern/cycles/render/svm.h
trunk/blender/intern/cycles/render/tables.cpp
trunk/blender/intern/cycles/render/tables.h
trunk/blender/intern/cycles/render/tile.cpp
trunk/blender/intern/cycles/render/tile.h
trunk/blender/intern/cycles/subd/subd_build.h
trunk/blender/intern/cycles/subd/subd_dice.cpp
trunk/blender/intern/cycles/subd/subd_dice.h
trunk/blender/intern/cycles/subd/subd_patch.cpp
trunk/blender/intern/cycles/subd/subd_patch.h
trunk/blender/intern/cycles/subd/subd_split.cpp
trunk/blender/intern/cycles/subd/subd_split.h
trunk/blender/intern/cycles/subd/subd_stencil.cpp
trunk/blender/intern/cycles/util/CMakeLists.txt
trunk/blender/intern/cycles/util/util_algorithm.h
trunk/blender/intern/cycles/util/util_args.h
trunk/blender/intern/cycles/util/util_boundbox.h
trunk/blender/intern/cycles/util/util_cache.cpp
trunk/blender/intern/cycles/util/util_cache.h
trunk/blender/intern/cycles/util/util_color.h
trunk/blender/intern/cycles/util/util_cuda.cpp
trunk/blender/intern/cycles/util/util_cuda.h
trunk/blender/intern/cycles/util/util_debug.h
trunk/blender/intern/cycles/util/util_dynlib.cpp
trunk/blender/intern/cycles/util/util_dynlib.h
trunk/blender/intern/cycles/util/util_foreach.h
trunk/blender/intern/cycles/util/util_function.h
trunk/blender/intern/cycles/util/util_hash.h
trunk/blender/intern/cycles/util/util_image.h
trunk/blender/intern/cycles/util/util_list.h
trunk/blender/intern/cycles/util/util_map.h
trunk/blender/intern/cycles/util/util_math.h
trunk/blender/intern/cycles/util/util_opengl.h
trunk/blender/intern/cycles/util/util_param.h
trunk/blender/intern/cycles/util/util_path.cpp
trunk/blender/intern/cycles/util/util_path.h
trunk/blender/intern/cycles/util/util_progress.h
trunk/blender/intern/cycles/util/util_set.h
trunk/blender/intern/cycles/util/util_stats.h
trunk/blender/intern/cycles/util/util_string.cpp
trunk/blender/intern/cycles/util/util_string.h
trunk/blender/intern/cycles/util/util_system.cpp
trunk/blender/intern/cycles/util/util_system.h
trunk/blender/intern/cycles/util/util_task.cpp
trunk/blender/intern/cycles/util/util_task.h
trunk/blender/intern/cycles/util/util_thread.h
trunk/blender/intern/cycles/util/util_time.cpp
trunk/blender/intern/cycles/util/util_time.h
trunk/blender/intern/cycles/util/util_transform.cpp
trunk/blender/intern/cycles/util/util_transform.h
trunk/blender/intern/cycles/util/util_types.h
trunk/blender/intern/cycles/util/util_vector.h
trunk/blender/intern/cycles/util/util_view.cpp
trunk/blender/intern/cycles/util/util_view.h
trunk/blender/intern/cycles/util/util_xml.h
Removed Paths:
-------------
trunk/blender/intern/cycles/doc/license/Blender.txt
trunk/blender/intern/cycles/doc/license/GPL.txt
trunk/blender/intern/cycles/util/util_memarena.cpp
trunk/blender/intern/cycles/util/util_memarena.h
Modified: trunk/blender/intern/cycles/app/cycles_server.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_server.cpp 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/app/cycles_server.cpp 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
/*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
*
- * 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 "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
*/
#include <stdio.h>
Modified: trunk/blender/intern/cycles/app/cycles_test.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_test.cpp 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/app/cycles_test.cpp 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
/*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
*
- * 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 "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
*/
#include <stdio.h>
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
/*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
*
- * 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 "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
*/
#include <stdio.h>
Modified: trunk/blender/intern/cycles/app/cycles_xml.h
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.h 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/app/cycles_xml.h 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
/*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
*
- * 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 "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
*/
#ifndef __CYCLES_XML__
Modified: trunk/blender/intern/cycles/app/io_export_cycles_xml.py
===================================================================
--- trunk/blender/intern/cycles/app/io_export_cycles_xml.py 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/app/io_export_cycles_xml.py 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
#
-# Copyright 2011, Blender Foundation.
+# Copyright 2011-2013 Blender Foundation
#
-# 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 "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# 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.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
#
# XML exporter for generating test files, not intended for end users
Modified: trunk/blender/intern/cycles/blender/CCL_api.h
===================================================================
--- trunk/blender/intern/cycles/blender/CCL_api.h 2013-08-18 14:15:57 UTC (rev 59236)
+++ trunk/blender/intern/cycles/blender/CCL_api.h 2013-08-18 14:16:15 UTC (rev 59237)
@@ -1,19 +1,17 @@
/*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
*
- * 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 "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
*/
#ifndef CCL_API_H
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list