[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52727] trunk/blender: fix own mistake with recent commit to skip calculating tessface.

[Campbell Barton]

Revision: 52727
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52727
Author:   campbellbarton
Date:     2012-12-03 02:26:13 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
fix own mistake with recent commit to skip calculating tessface. If you were already in editmode the tessfaces wouldn't get recalculated.

also minor edits to bmesh rst.

Modified Paths:
--------------
    trunk/blender/doc/python_api/rst/include__bmesh.rst
    trunk/blender/source/blender/editors/mesh/editmesh_add.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_api.c

Modified: trunk/blender/doc/python_api/rst/include__bmesh.rst
===================================================================
--- trunk/blender/doc/python_api/rst/include__bmesh.rst	2012-12-03 02:25:19 UTC (rev 52726)
+++ trunk/blender/doc/python_api/rst/include__bmesh.rst	2012-12-03 02:26:13 UTC (rev 52727)
@@ -4,6 +4,13 @@
    ./blender.bin -b -noaudio -P doc/python_api/sphinx_doc_gen.py -- --partial bmesh* ; cd doc/python_api ; sphinx-build sphinx-in sphinx-out ; cd ../../
 
 
+Submodules:
+
+* :mod:`bmesh.ops`
+* :mod:`bmesh.types`
+* :mod:`bmesh.utils`
+
+
 Intro
 -----
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-12-03 02:25:19 UTC (rev 52726)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-12-03 02:26:13 UTC (rev 52727)
@@ -55,6 +55,8 @@
 
 /* ********* add primitive operators ************* */
 
+/* BMESH_TODO: 'state' is not a good name, should be flipped and called 'was_editmode',
+ * or at least something more descriptive */
 static Object *make_prim_init(bContext *C, const char *idname,
                               float *dia, float mat[][4],
                               int *state, const float loc[3], const float rot[3], const unsigned int layer)
@@ -81,16 +83,17 @@
 static void make_prim_finish(bContext *C, Object *obedit, int *state, int enter_editmode)
 {
 	BMEditMesh *em = BMEdit_FromObject(obedit);
+	const int exit_editmode = (*state && !enter_editmode);
 
 	/* Primitive has all verts selected, use vert select flush
 	 * to push this up to edges & faces. */
 	EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
 
 	/* only recalc editmode tessface if we are staying in editmode */
-	EDBM_update_generic(C, em, enter_editmode);
+	EDBM_update_generic(C, em, !exit_editmode);
 
 	/* userdef */
-	if (*state && !enter_editmode) {
+	if (exit_editmode) {
 		ED_object_exit_editmode(C, EM_FREEDATA); /* adding EM_DO_UNDO messes up operator redo */
 	}
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_api.c	2012-12-03 02:25:19 UTC (rev 52726)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_api.c	2012-12-03 02:26:13 UTC (rev 52727)
@@ -153,13 +153,6 @@
 PyDoc_STRVAR(BPy_BM_doc,
 "This module provides access to blenders bmesh data structures.\n"
 "\n"
-"\n"
-"Submodules:\n"
-"\n"
-"* :mod:`bmesh.utils`\n"
-"* :mod:`bmesh.types`\n"
-"\n"
-"\n"
 ".. include:: include__bmesh.rst\n"
 );
 static struct PyModuleDef BPy_BM_module_def = {