[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57729] branches/soc-2013-depsgraph_mt: Merging r57726 through r57728 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 25 11:32:20 CEST 2013
Revision: 57729
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57729
Author: nazgul
Date: 2013-06-25 09:32:20 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Merging r57726 through r57728 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57726
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57728
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/curve_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/physics/physics_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_api/spacetypes.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-depsgraph_mt/source/blender/editors/util/undo.c
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-57725
+ /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-57728
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/curve/curve_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/curve/curve_ops.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/curve/curve_ops.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -34,6 +34,7 @@
#include "DNA_curve_types.h"
+#include "DNA_scene_types.h"
#include "BLI_math.h"
#include "BLI_blenlib.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h 2013-06-25 09:32:20 UTC (rev 57729)
@@ -69,8 +69,6 @@
struct PropertyRNA;
struct EnumPropertyItem;
-enum eVGroupSelect;
-
/* object_edit.c */
struct Object *ED_object_context(struct bContext *C); /* context.object */
struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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
/trunk/blender/source/blender/editors/interface/interface.c:57395-57725
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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
/trunk/blender/source/blender/editors/interface/interface.c:57395-57728
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_add.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_add.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -30,6 +30,7 @@
*/
#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "BLI_math.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -37,6 +37,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "BLI_listbase.h"
#include "BLI_noise.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_ops.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_ops.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -28,6 +28,8 @@
* \ingroup edmesh
*/
+#include "DNA_scene_types.h"
+
#include "BLI_math.h"
#include "RNA_access.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_ops.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_ops.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -28,6 +28,8 @@
* \ingroup edmeta
*/
+#include "DNA_scene_types.h"
+
#include "BLI_utildefines.h"
#include "RNA_access.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/physics/physics_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/physics/physics_ops.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/physics/physics_ops.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -29,6 +29,8 @@
#include <stdlib.h>
+#include "DNA_scene_types.h"
+
#include "BLI_utildefines.h"
#include "RNA_access.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_api/spacetypes.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/space_api/spacetypes.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/space_api/spacetypes.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -33,6 +33,7 @@
#include "BLI_utildefines.h"
#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "DNA_windowmanager_types.h"
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/logic_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/logic_ops.c 2013-06-25 09:27:31 UTC (rev 57728)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/space_logic/logic_ops.c 2013-06-25 09:32:20 UTC (rev 57729)
@@ -34,6 +34,7 @@
#include "DNA_sensor_types.h"
#include "DNA_controller_types.h"
#include "DNA_actuator_types.h"
+#include "DNA_scene_types.h"
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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
/trunk/blender/source/blender/editors/space_outliner:57395-57725
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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
/trunk/blender/source/blender/editors/space_outliner:57395-57728
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_iterators.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list