[tuhopuu-devel] State of the Merge

[Chris Want]

The merge went pretty smoothly, here are the only two rough
spots:

Bjorn + whomever: check source/blender/src/buttons_object.c
for code related to softbodies/constraints.

Matt please check source/blender/python/api2_2x/Blender.c.
See below ... I went with second version for each conflict.

--------------------------------
<<<<<<< Blender.c
#include "../BPY_menus.h"	/* for BPyMenu_RemoveAllEntries() */
=======
#include "../BPY_menus.h"	/* to update menus */
 >>>>>>> 1.1.1.2
---------------------------------

AND

----------------------------------
<<<<<<< Blender.c
static PyObject *Blender_UpdateMenus( PyObject * self, PyObject * args );
=======
static PyObject *Blender_UpdateMenus( PyObject * self);
 >>>>>>> 1.1.1.2
-----------------------------------

AND

-----------------------------------
<<<<<<< Blender.c
static char Blender_UpdateMenus_doc[] =
       "() - Update Blender's Python scripts in menus";

=======
static char Blender_UpdateMenus_doc[] =
	"() - Update the menus where scripts are registered.  Only needed for\n\
scripts that save other new scripts in the default or user defined 
folders.";

 >>>>>>> 1.1.1.2
--------------------------------------

AND

--------------------------------------
<<<<<<< Blender.c
	{"ReleaseGlobalDict", &Blender_ReleaseGlobalDict,
	 METH_VARARGS, Blender_ReleaseGlobalDict_doc},
	{"UpdateMenus", &Blender_UpdateMenus, METH_VARARGS,
	 Blender_UpdateMenus_doc},
=======
	{"UpdateMenus", ( PyCFunction ) Blender_UpdateMenus, METH_NOARGS,
	 Blender_UpdateMenus_doc},
 >>>>>>> 1.1.1.2
-------------------------------------