bmesh py api: add bmesh.update_edit_mode(), there was no way to redraw the 3d view or re-calculate face tessellation from python.

add py template for editing meshes in editmode.

also remove double call to CTX_wm_region which does a string lookup.

3 files changed, 55 insertions, 7 deletions

diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 5a25861a74a..58c6e051e48 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -581,8 +581,7 @@ static BMOpDefine bmo_edgenet_prepare_def = {
 /*
  * Rotate.
  *
- * Rotate vertices around a center, using a 3x3 rotation
- * matrix.  Equivalent of the old rotateflag function.
+ * Rotate vertices around a center, using a 3x3 rotation matrix.
  */
 static BMOpDefine bmo_rotate_def = {
 	"rotate",
@@ -600,8 +599,7 @@ static BMOpDefine bmo_rotate_def = {
 /*
  * Translate.
  *
- * Translate vertices by an offset.  Equivalent of the
- * old translateflag function.
+ * Translate vertices by an offset.
  */
 static BMOpDefine bmo_translate_def = {
 	"translate",
diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c
index e02efc79da0..697a9259b37 100644
--- a/source/blender/python/bmesh/bmesh_py_api.c
+++ b/source/blender/python/bmesh/bmesh_py_api.c
@@ -51,7 +51,6 @@
 
 #include "bmesh_py_api.h" /* own include */
 
-
 PyDoc_STRVAR(bpy_bm_new_doc,
 ".. method:: new()\n"
 "\n"
@@ -73,6 +72,8 @@ PyDoc_STRVAR(bpy_bm_from_edit_mesh_doc,
 "\n"
 "   Return a BMesh from this mesh, currently the mesh must already be in editmode.\n"
 "\n"
+"   :arg mesh: The editmode mesh.\n"
+"   :type mesh: :class:`bpy.types.Mesh`\n"
 "   :return: the BMesh associated with this mesh.\n"
 "   :rtype: :class:`bmesh.types.BMesh`\n"
 );
@@ -96,9 +97,56 @@ static PyObject *bpy_bm_from_edit_mesh(PyObject *UNUSED(self), PyObject *value)
 	return BPy_BMesh_CreatePyObject(bm, BPY_BMFLAG_IS_WRAPPED);
 }
 
+PyDoc_STRVAR(bpy_bm_update_edit_mesh_doc,
+".. method:: update_edit_mesh(mesh, tessface=True)\n"
+"\n"
+"   Update the mesh after changes to the BMesh in editmode, \n"
+"   optionally recalculating n-gon tessellation.\n"
+"\n"
+"   :arg mesh: The editmode mesh.\n"
+"   :type mesh: :class:`bpy.types.Mesh`\n"
+"   :arg tessface: Option to recalculate n-gon tessellation.\n"
+"   :type tessface: boolean\n"
+);
+static PyObject *bpy_bm_update_edit_mesh(PyObject *UNUSED(self), PyObject *args)
+{
+	PyObject *py_me;
+	Mesh *me;
+	int do_tessface = TRUE;
+
+	if (!PyArg_ParseTuple(args, "O|i:update_edit_mesh", &py_me, &do_tessface)) {
+		return NULL;
+	}
+
+	me = PyC_RNA_AsPointer(py_me, "Mesh");
+
+	if (me == NULL) {
+		return NULL;
+	}
+
+	if (me->edit_btmesh == NULL) {
+		PyErr_SetString(PyExc_ValueError,
+		                "The mesh must be in editmode");
+		return NULL;
+	}
+
+	{
+		/* XXX, not great - infact this function could just not use the context at all
+		 * postpone that change until after release: BMESH_TODO - campbell */
+		extern struct bContext *BPy_GetContext(void);
+		extern void EDBM_update_generic(struct bContext *C, BMEditMesh *em, const short do_tessface);
+
+		struct bContext *C = BPy_GetContext();
+		EDBM_update_generic(C, me->edit_btmesh, do_tessface);
+	}
+
+	Py_RETURN_NONE;
+}
+
 static struct PyMethodDef BPy_BM_methods[] = {
 	{"new",            (PyCFunction)bpy_bm_new,            METH_NOARGS,  bpy_bm_new_doc},
 	{"from_edit_mesh", (PyCFunction)bpy_bm_from_edit_mesh, METH_O,       bpy_bm_from_edit_mesh_doc},
+	{"update_edit_mesh", (PyCFunction)bpy_bm_update_edit_mesh, METH_VARARGS, bpy_bm_update_edit_mesh_doc},
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index b3c9cfbc79e..c0e3b19c716 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -135,6 +135,7 @@ static int wm_test_duplicate_notifier(wmWindowManager *wm, unsigned int type, vo
 /* XXX: in future, which notifiers to send to other windows? */
 void WM_event_add_notifier(const bContext *C, unsigned int type, void *reference)
 {
+	ARegion *ar;
 	wmNotifier *note = MEM_callocN(sizeof(wmNotifier), "notifier");
 	
 	note->wm = CTX_wm_manager(C);
@@ -142,8 +143,9 @@ void WM_event_add_notifier(const bContext *C, unsigned int type, void *reference
 	
 	note->window = CTX_wm_window(C);
 	
-	if (CTX_wm_region(C))
-		note->swinid = CTX_wm_region(C)->swinid;
+	ar = CTX_wm_region(C);
+	if (ar)
+		note->swinid = ar->swinid;
 	
 	note->category = type & NOTE_CATEGORY;
 	note->data = type & NOTE_DATA;