[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49062] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49037:49061
Campbell Barton
ideasman42 at gmail.com
Thu Jul 19 12:29:40 CEST 2012
Revision: 49062
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49062
Author: campbellbarton
Date: 2012-07-19 10:29:39 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49037:49061
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49037
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoBase.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49037
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49061
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py 2012-07-19 10:29:39 UTC (rev 49062)
@@ -36,6 +36,10 @@
bl_idname = "mesh.delete_edgeloop"
bl_label = "Delete Edge Loop"
+ @classmethod
+ def poll(cls, context):
+ return bpy.ops.transform.edge_slide.poll()
+
def execute(self, context):
if 'FINISHED' in bpy.ops.transform.edge_slide(value=1.0):
bpy.ops.mesh.select_more()
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -29,7 +29,6 @@
* \ingroup bke
*/
-
#include <stddef.h>
#include <math.h>
@@ -98,8 +97,6 @@
#include <string.h>
#endif // WITH_MOD_FLUID
-//XXX #include "BIF_screen.h"
-
EffectorWeights *BKE_add_effector_weights(Group *group)
{
EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights");
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -29,8 +29,6 @@
* \ingroup bke
*/
-
-
#include <stdio.h>
#include <string.h>
#include <math.h>
@@ -65,7 +63,6 @@
#include "BKE_deform.h"
-//XXX #include "BIF_editdeform.h"
void calc_lat_fudu(int flag, int res, float *fu, float *du)
{
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -78,9 +78,8 @@
#include "BKE_DerivedMesh.h"
#include "BKE_pointcache.h"
#include "BKE_deform.h"
-#include "BKE_mesh.h"
-//XXX #include "BIF_editdeform.h"
-//XXX #include "BIF_graphics.h"
+#include "BKE_mesh.h"
+
#include "PIL_time.h"
// #include "ONL_opennl.h" remove linking to ONL for now
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -52,11 +52,8 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
-//XXX #include "BIF_toolbox.h"
-
#include "BKE_font.h"
-
#include "DNA_vfont_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_curve_types.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-07-19 10:29:39 UTC (rev 49062)
@@ -95,7 +95,9 @@
} \
} \
}
-void COM_startReadHighlights() {
+
+void COM_startReadHighlights()
+{
if (g_highlightedNodesRead) {
delete [] g_highlightedNodesRead;
}
@@ -108,7 +110,8 @@
}
}
-int COM_isHighlightedbNode(bNode* bnode) {
+int COM_isHighlightedbNode(bNode* bnode)
+{
if (!g_highlightedNodesRead) return false;
for (int i = 0 ; i < MAX_HIGHLIGHT; i++) {
void* p = g_highlightedNodesRead[i];
Modified: branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -1213,6 +1213,8 @@
/* 2) duplicate base */
newbase = ED_object_add_duplicate(bmain, scene, oldbase, USER_DUP_ARM); /* only duplicate linked armature */
+ DAG_scene_sort(bmain, scene);
+
newob = newbase->object;
newbase->flag &= ~SELECT;
Modified: branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -25,7 +25,6 @@
* \ingroup edarmature
*/
-
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
@@ -49,8 +48,6 @@
#include "BLI_rand.h"
#include "BLI_threads.h"
-//#include "BDR_editobject.h"
-
#include "BKE_constraint.h"
#include "BKE_armature.h"
#include "BKE_context.h"
@@ -60,11 +57,8 @@
#include "BIF_retarget.h"
+#include "reeb.h" /* FIX ME */
-//#include "mydevice.h"
-#include "reeb.h" // FIX ME
-//#include "blendef.h"
-
#include "armature_intern.h"
/************ RIG RETARGET DATA STRUCTURES ***************/
Modified: branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -22,7 +22,6 @@
* \ingroup edarmature
*/
-
#include <string.h>
#include <math.h>
#include <float.h>
@@ -49,27 +48,18 @@
#include "ED_screen.h"
#include "BIF_gl.h"
-//#include "BIF_screen.h"
-//#include "BIF_space.h"
-//#include "BIF_mywindow.h"
#include "ED_armature.h"
#include "armature_intern.h"
-//#include "BIF_sketch.h"
#include "BIF_retarget.h"
#include "BIF_generate.h"
-//#include "BIF_interface.h"
#include "ED_transform.h"
#include "WM_api.h"
#include "WM_types.h"
-//#include "blendef.h"
-//#include "mydevice.h"
#include "reeb.h"
-
-
typedef int (*GestureDetectFct)(bContext *, SK_Gesture *, SK_Sketch *);
typedef void (*GestureApplyFct)(bContext *, SK_Gesture *, SK_Sketch *);
Modified: branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/armature/reeb.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/editors/armature/reeb.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -24,11 +24,10 @@
* \ingroup edarmature
*/
-
#include <math.h>
-#include <string.h> // for memcpy
+#include <string.h> /* for memcpy */
#include <stdio.h>
-#include <stdlib.h> // for qsort
+#include <stdlib.h> /* for qsort */
#include <float.h>
#include "DNA_scene_types.h"
@@ -45,16 +44,8 @@
#include "BLI_ghash.h"
#include "BLI_heap.h"
-//#include "BDR_editobject.h"
-
-//#include "BIF_interface.h"
-//#include "BIF_toolbox.h"
-//#include "BIF_graphics.h"
-
#include "BKE_mesh.h"
-//#include "blendef.h"
-
#include "ONL_opennl.h"
#include "reeb.h"
Modified: branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c 2012-07-19 10:23:25 UTC (rev 49061)
+++ branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c 2012-07-19 10:29:39 UTC (rev 49062)
@@ -1369,6 +1369,8 @@
/* 1. duplicate the object and data */
newbase = ED_object_add_duplicate(bmain, scene, oldbase, 0); /* 0 = fully linked */
+ DAG_scene_sort(bmain, scene);
+
ED_base_object_select(newbase, BA_DESELECT);
newob = newbase->object;
Property changes on: branches/soc-2011-tomato/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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49037
+ /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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list