[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58275] branches/soc-2013-paint: Merge trunk -r58270 into soc-2013-paint
Antony Riakiotakis
kalast at gmail.com
Mon Jul 15 18:17:22 CEST 2013
Revision: 58275
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58275
Author: psy-fi
Date: 2013-07-15 16:17:21 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Merge trunk -r58270 into soc-2013-paint
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58270
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/build_files/cmake/macros.cmake
branches/soc-2013-paint/extern/libredcode/codec.c
branches/soc-2013-paint/extern/libredcode/codec.h
branches/soc-2013-paint/extern/libredcode/debayer.c
branches/soc-2013-paint/extern/libredcode/debayer.h
branches/soc-2013-paint/extern/libredcode/format.c
branches/soc-2013-paint/extern/libredcode/format.h
branches/soc-2013-paint/intern/bsp/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_sync.h
branches/soc-2013-paint/intern/cycles/render/film.cpp
branches/soc-2013-paint/intern/cycles/render/light.cpp
branches/soc-2013-paint/intern/cycles/render/mesh.cpp
branches/soc-2013-paint/intern/cycles/render/mesh.h
branches/soc-2013-paint/intern/cycles/render/tables.cpp
branches/soc-2013-paint/intern/iksolver/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c
branches/soc-2013-paint/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-paint/source/blender/blenkernel/intern/effect.c
branches/soc-2013-paint/source/blender/blenkernel/intern/font.c
branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/particle.c
branches/soc-2013-paint/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-paint/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-paint/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-paint/source/blender/blenlib/BLI_string.h
branches/soc-2013-paint/source/blender/blenlib/intern/listbase.c
branches/soc-2013-paint/source/blender/blenlib/intern/string.c
branches/soc-2013-paint/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-paint/source/blender/collada/AnimationImporter.cpp
branches/soc-2013-paint/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-paint/source/blender/collada/ArmatureImporter.h
branches/soc-2013-paint/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-paint/source/blender/collada/TransformWriter.cpp
branches/soc-2013-paint/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-paint/source/blender/editors/armature/armature_select.c
branches/soc-2013-paint/source/blender/editors/curve/editfont.c
branches/soc-2013-paint/source/blender/editors/interface/interface_panel.c
branches/soc-2013-paint/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-paint/source/blender/editors/object/object_transform.c
branches/soc-2013-paint/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-paint/source/blender/editors/space_file/filelist.c
branches/soc-2013-paint/source/blender/editors/space_image/image_ops.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-paint/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-paint/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-paint/source/blender/makesdna/DNA_particle_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_util.h
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2013-paint/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2013-paint/source/blender/render/intern/source/render_texture.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-paint/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Converter/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Network/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/VideoTexture/CMakeLists.txt
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/extern/libredcode/codec.c
===================================================================
--- branches/soc-2013-paint/extern/libredcode/codec.c 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/codec.c 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/extern/libredcode/codec.h
===================================================================
--- branches/soc-2013-paint/extern/libredcode/codec.h 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/codec.h 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/extern/libredcode/debayer.c
===================================================================
--- branches/soc-2013-paint/extern/libredcode/debayer.c 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/debayer.c 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/extern/libredcode/debayer.h
===================================================================
--- branches/soc-2013-paint/extern/libredcode/debayer.h 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/debayer.h 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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-paint/extern/libredcode/format.c
===================================================================
--- branches/soc-2013-paint/extern/libredcode/format.c 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/format.c 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: branches/soc-2013-paint/extern/libredcode/format.h
===================================================================
--- branches/soc-2013-paint/extern/libredcode/format.h 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/extern/libredcode/format.h 2013-07-15 16:17:21 UTC (rev 58275)
@@ -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 __FORMAT_H__
#define __FORMAT_H__
Modified: branches/soc-2013-paint/intern/bsp/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/intern/bsp/CMakeLists.txt 2013-07-15 15:25:34 UTC (rev 58274)
+++ branches/soc-2013-paint/intern/bsp/CMakeLists.txt 2013-07-15 16:17:21 UTC (rev 58275)
@@ -28,10 +28,10 @@
../container
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list