[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57935] branches/soc-2013-depsgraph_mt: Merging r57925 through r57933 from trunk into soc-2013-depsgraph_mt

Tue Jul 2 21:18:11 CEST 2013

Revision: 57935
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57935
Author:   nazgul
Date:     2013-07-02 19:18:10 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Merging r57925 through r57933 from trunk into soc-2013-depsgraph_mt

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

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_bpath.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_brush.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_ocean.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_report.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_speaker.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/bpath.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/context.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/speaker.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_heap.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_kdtree.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/armature/meshlaplacian.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/resources.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_relations.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_autocomplete.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_format_lua.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_format_osl.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_format_py.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/util/numinput.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_image.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh_utils.h
    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/python/BPY_extern.h
    branches/soc-2013-depsgraph_mt/source/blender/python/generic/bgl.c
    branches/soc-2013-depsgraph_mt/source/blender/python/generic/bgl.h
    branches/soc-2013-depsgraph_mt/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2013-depsgraph_mt/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Color.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_geometry.h
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/strand.h
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/bake.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/strand.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/wm_event_types.h
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp

Removed Paths:
-------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_script.h

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-57924
   + /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-57933

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_bpath.h
===================================================================

--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_bpath.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_bpath.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,11 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
  * Contributor(s): Campbell Barton
  *
  * ***** END GPL LICENSE BLOCK *****

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_brush.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_brush.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_brush.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,15 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
  * ***** END GPL LICENSE BLOCK *****
- * General operations for brushes.
  */
 
 #ifndef __BKE_BRUSH_H__
@@ -31,6 +23,8 @@
 
 /** \file BKE_brush.h
  *  \ingroup bke
+ *
+ * General operations for brushes.
  */
 
 struct ID;

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_idprop.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_idprop.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_idprop.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,9 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
  * Contributor(s): Joseph Eagar
  *
  * ***** END GPL LICENSE BLOCK *****

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,9 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
  * The Original Code is: all of this file.
  *
  * Contributor(s): none yet.

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,9 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
  * The Original Code is: all of this file.
  *
  * Contributor(s): none yet.

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_ocean.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_ocean.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_ocean.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,9 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
  * Contributors: Matt Ebb
  *
  * ***** END GPL LICENSE BLOCK *****

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_report.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_report.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_report.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,9 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
  * Contributor(s): Blender Foundation (2008).
  *
  * ***** END GPL LICENSE BLOCK *****

Deleted: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_script.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_script.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_script.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -1,47 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * 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.
- *
- * 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.
- *
- * 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.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Willian P. Germano.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef __BKE_SCRIPT_H__
-#define __BKE_SCRIPT_H__
-
-/** \file BKE_script.h
- *  \ingroup bke
- *  \since March 2001
- *  \author nzc
- *  \author Willian P. Germano
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Script;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __BKE_SCRIPT_H__ */

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_speaker.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_speaker.h	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_speaker.h	2013-07-02 19:18:10 UTC (rev 57935)
@@ -15,11 +15,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
  * Contributor(s): Jörg Müller.
  *
  * ***** END GPL LICENSE BLOCK *****

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/CMakeLists.txt	2013-07-02 19:18:10 UTC (rev 57935)
@@ -230,7 +230,6 @@
 	BKE_sca.h
 	BKE_scene.h
 	BKE_screen.h
-	BKE_script.h
 	BKE_sequencer.h
 	BKE_shrinkwrap.h
 	BKE_sketch.h

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.c	2013-07-02 19:17:34 UTC (rev 57934)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/CCGSubSurf.c	2013-07-02 19:18:10 UTC (rev 57935)
@@ -1,3 +1,22 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License

@@ Diff output truncated at 10240 characters. @@

