[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58266] branches/soc-2013-depsgraph_mt: Merging r58196 through r58265 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Mon Jul 15 13:25:57 CEST 2013 

Revision: 58266
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58266
Author:   nazgul
Date:     2013-07-15 11:25:56 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Merging r58196 through r58265 from trunk into soc-2013-depsgraph_mt

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58196
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58265

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
    branches/soc-2013-depsgraph_mt/extern/libredcode/codec.c
    branches/soc-2013-depsgraph_mt/extern/libredcode/codec.h
    branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.c
    branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.h
    branches/soc-2013-depsgraph_mt/extern/libredcode/format.c
    branches/soc-2013-depsgraph_mt/extern/libredcode/format.h
    branches/soc-2013-depsgraph_mt/intern/bsp/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_sync.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/film.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/light.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/mesh.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/mesh.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/tables.cpp
    branches/soc-2013-depsgraph_mt/intern/iksolver/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/blender/blenfont/intern/blf_font.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/boids.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/constraint.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/font.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/lattice.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/linestyle.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/material.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_listbase.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_string.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/listbase.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/string.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_connect_pair.c
    branches/soc-2013-depsgraph_mt/source/blender/collada/AnimationImporter.cpp
    branches/soc-2013-depsgraph_mt/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2013-depsgraph_mt/source/blender/collada/ArmatureImporter.h
    branches/soc-2013-depsgraph_mt/source/blender/collada/DocumentImporter.cpp
    branches/soc-2013-depsgraph_mt/source/blender/collada/TransformWriter.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_markers.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/armature/armature_select.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editfont.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_panel.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_data.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_add.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_transform.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_file/filelist.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_time/space_time.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_ruler.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_orientations.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/BoxGrid.cpp
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/GridDensityProvider.h
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
    branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
    branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/util.c
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/intern/makesdna.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2013-depsgraph_mt/source/blender/render/extern/include/RE_engine.h
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/external_engine.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/render_texture.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_playanim.c
    branches/soc-2013-depsgraph_mt/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Network/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/SceneGraph/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/gameengine/VideoTexture/CMakeLists.txt

Property Changed:
----------------
    branches/soc-2013-depsgraph_mt/
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58195
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58265

Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-07-15 11:25:56 UTC (rev 58266)
@@ -2053,6 +2053,20 @@
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
 
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)

Modified: branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake	2013-07-15 11:25:56 UTC (rev 58266)
@@ -530,7 +530,9 @@
 
 	foreach(_SOURCE ${ARGV})
 
-		if(CMAKE_COMPILER_IS_GNUCC)
+		if(CMAKE_COMPILER_IS_GNUCC OR
+		  (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+
 			set_source_files_properties(${_SOURCE}
 				PROPERTIES
 					COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"

Modified: branches/soc-2013-depsgraph_mt/extern/libredcode/codec.c
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libredcode/codec.c	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/extern/libredcode/codec.c	2013-07-15 11:25:56 UTC (rev 58266)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode 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.
+ *
+ * Libredcode 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 libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
 #include "codec.h"
 #include "format.h"
 #include "debayer.h"

Modified: branches/soc-2013-depsgraph_mt/extern/libredcode/codec.h
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libredcode/codec.h	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/extern/libredcode/codec.h	2013-07-15 11:25:56 UTC (rev 58266)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode 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.
+ *
+ * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
 #ifndef __CODEC_H__
 #define __CODEC_H__
 

Modified: branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.c
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.c	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.c	2013-07-15 11:25:56 UTC (rev 58266)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode 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.
+ *
+ * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
 #include "debayer.h"
 
 /* pretty simple but astonishingly very effective "debayer" function 

Modified: branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.h
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.h	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/extern/libredcode/debayer.h	2013-07-15 11:25:56 UTC (rev 58266)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode 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.
+ *
+ * Libredcode 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 Libredcode; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****/
+
 #ifndef __DEBAYER_H__
 #define __DEBAYER_H__
 

Modified: branches/soc-2013-depsgraph_mt/extern/libredcode/format.c
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libredcode/format.c	2013-07-15 11:11:36 UTC (rev 58265)
+++ branches/soc-2013-depsgraph_mt/extern/libredcode/format.c	2013-07-15 11:25:56 UTC (rev 58266)
@@ -1,3 +1,25 @@
+/* ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * Copyright 2008 Peter Schlaile
+ *
+ * This file is part of libredcode.
+ *
+ * Libredcode 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.
+ *
+ * Libredcode 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

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list