[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58356] branches/soc-2013-dingto: Merged revision(s) 58241-58355 from trunk/blender into soc-2013-dingto.

Wed Jul 17 23:43:38 CEST 2013

Revision: 58356
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58356
Author:   dingto
Date:     2013-07-17 21:43:38 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Merged revision(s) 58241-58355 from trunk/blender into soc-2013-dingto. 

Modified Paths:
--------------
    branches/soc-2013-dingto/CMakeLists.txt
    branches/soc-2013-dingto/build_files/cmake/macros.cmake
    branches/soc-2013-dingto/extern/libredcode/codec.c
    branches/soc-2013-dingto/extern/libredcode/codec.h
    branches/soc-2013-dingto/extern/libredcode/debayer.c
    branches/soc-2013-dingto/extern/libredcode/debayer.h
    branches/soc-2013-dingto/extern/libredcode/format.c
    branches/soc-2013-dingto/extern/libredcode/format.h
    branches/soc-2013-dingto/intern/bsp/CMakeLists.txt
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_light.h
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_DropTargetWin32.h
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_DropTargetX11.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_DropTargetX11.h
    branches/soc-2013-dingto/intern/iksolver/CMakeLists.txt
    branches/soc-2013-dingto/intern/opencl/OCL_opencl.h
    branches/soc-2013-dingto/intern/opencl/intern/OCL_opencl.c
    branches/soc-2013-dingto/intern/opencl/intern/clew.c
    branches/soc-2013-dingto/intern/smoke/CMakeLists.txt
    branches/soc-2013-dingto/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-dingto/release/scripts/startup/bl_operators/node.py
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/brush.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/customdata.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/effect.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/font.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/smoke.c
    branches/soc-2013-dingto/source/blender/blenlib/BLI_listbase.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_string.h
    branches/soc-2013-dingto/source/blender/blenlib/intern/fileops.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/listbase.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/string.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/soc-2013-dingto/source/blender/collada/AnimationImporter.cpp
    branches/soc-2013-dingto/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2013-dingto/source/blender/collada/ArmatureImporter.h
    branches/soc-2013-dingto/source/blender/collada/DocumentImporter.cpp
    branches/soc-2013-dingto/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2013-dingto/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_TextureOperation.h
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2013-dingto/source/blender/editors/armature/armature_select.c
    branches/soc-2013-dingto/source/blender/editors/armature/armature_utils.c
    branches/soc-2013-dingto/source/blender/editors/curve/editfont.c
    branches/soc-2013-dingto/source/blender/editors/include/ED_armature.h
    branches/soc-2013-dingto/source/blender/editors/interface/interface.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_panel.c
    branches/soc-2013-dingto/source/blender/editors/mesh/mesh_data.c
    branches/soc-2013-dingto/source/blender/editors/object/object_add.c
    branches/soc-2013-dingto/source/blender/editors/object/object_transform.c
    branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-dingto/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
    branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
    branches/soc-2013-dingto/source/blender/editors/render/render_shading.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2013-dingto/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-dingto/source/blender/editors/space_file/filelist.c
    branches/soc-2013-dingto/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-dingto/source/blender/editors/transform/transform_orientations.c
    branches/soc-2013-dingto/source/blender/imbuf/intern/cineon/logImageCore.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_laplaciansmooth.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_surface.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2013-dingto/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2013-dingto/source/blender/render/intern/source/render_texture.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Network/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/SceneGraph/CMakeLists.txt
    branches/soc-2013-dingto/source/gameengine/VideoTexture/CMakeLists.txt

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


Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58240
   + /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58355

Modified: branches/soc-2013-dingto/CMakeLists.txt
===================================================================

--- branches/soc-2013-dingto/CMakeLists.txt	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/CMakeLists.txt	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/macros.cmake	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/build_files/cmake/macros.cmake	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/extern/libredcode/codec.c
===================================================================
--- branches/soc-2013-dingto/extern/libredcode/codec.c	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/extern/libredcode/codec.c	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/extern/libredcode/codec.h
===================================================================
--- branches/soc-2013-dingto/extern/libredcode/codec.h	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/extern/libredcode/codec.h	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/extern/libredcode/debayer.c
===================================================================
--- branches/soc-2013-dingto/extern/libredcode/debayer.c	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/extern/libredcode/debayer.c	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/extern/libredcode/debayer.h
===================================================================
--- branches/soc-2013-dingto/extern/libredcode/debayer.h	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/extern/libredcode/debayer.h	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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-dingto/extern/libredcode/format.c
===================================================================
--- branches/soc-2013-dingto/extern/libredcode/format.c	2013-07-17 21:28:48 UTC (rev 58355)
+++ branches/soc-2013-dingto/extern/libredcode/format.c	2013-07-17 21:43:38 UTC (rev 58356)
@@ -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,

@@ Diff output truncated at 10240 characters. @@

