[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52932] trunk/blender/source/blender: remove context argument from EDBM_update_generic()
Campbell Barton
ideasman42 at gmail.com
Wed Dec 12 16:22:56 CET 2012
Revision: 52932
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52932
Author: campbellbarton
Date: 2012-12-12 15:22:54 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
remove context argument from EDBM_update_generic()
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2012-12-12 15:22:54 UTC (rev 52932)
@@ -119,8 +119,7 @@
void EDBM_mesh_hide(struct BMEditMesh *em, int swap);
void EDBM_mesh_reveal(struct BMEditMesh *em);
-void EDBM_update_generic(struct bContext *C, struct BMEditMesh *em,
- const short do_tessface, const short is_destructive);
+void EDBM_update_generic(struct BMEditMesh *em, const short do_tessface, const short is_destructive);
struct UvElementMap *EDBM_uv_element_map_create(struct BMEditMesh *em, int selected, int doIslands);
void EDBM_uv_element_map_free(struct UvElementMap *vmap);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -90,7 +90,7 @@
EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX);
/* only recalc editmode tessface if we are staying in editmode */
- EDBM_update_generic(C, em, !exit_editmode, TRUE);
+ EDBM_update_generic(em, !exit_editmode, TRUE);
/* userdef */
if (exit_editmode) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -2830,7 +2830,7 @@
#endif
/* called on tool confirmation */
-static void knifetool_finish(bContext *C, wmOperator *op)
+static void knifetool_finish(wmOperator *op)
{
KnifeTool_OpData *kcd = op->customdata;
@@ -2841,7 +2841,7 @@
#endif
EDBM_mesh_normals_update(kcd->em);
- EDBM_update_generic(C, kcd->em, TRUE, TRUE);
+ EDBM_update_generic(kcd->em, TRUE, TRUE);
}
/* copied from paint_image.c */
@@ -3129,7 +3129,7 @@
/* finish */
ED_region_tag_redraw(kcd->ar);
- knifetool_finish(C, op);
+ knifetool_finish(op);
knifetool_exit(C, op);
ED_area_headerprint(CTX_wm_area(C), NULL);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -335,7 +335,7 @@
use_only_quads, 0);
/* tessface is already re-recalculated */
- EDBM_update_generic(C, em, FALSE, TRUE);
+ EDBM_update_generic(em, FALSE, TRUE);
/* force edge slide to edge select mode in in face select mode */
if (em->selectmode & SCE_SELECT_FACE) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -1044,7 +1044,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -725,7 +725,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
/* we succeeded */
return OPERATOR_FINISHED;
@@ -767,7 +767,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
/* we succeeded */
return OPERATOR_FINISHED;
@@ -812,7 +812,7 @@
EDBM_selectmode_flush(em);
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
/* we succeeded */
return OPERATOR_FINISHED;
@@ -1431,7 +1431,7 @@
/* ******************* mesh shortest path select, uses prev-selected edge ****************** */
/* since you want to create paths with multiple selects, it doesn't have extend option */
-static int mouse_mesh_shortest_path_edge(bContext *C, ViewContext *vc)
+static int mouse_mesh_shortest_path_edge(ViewContext *vc)
{
BMEditMesh *em = vc->em;
BMEdge *e_dst;
@@ -1470,7 +1470,7 @@
BM_select_history_store(em->bm, e_dst);
/* force drawmode for mesh */
- switch (CTX_data_tool_settings(C)->edge_mode) {
+ switch (vc->scene->toolsettings->edge_mode) {
case EDGE_MODE_TAG_SEAM:
me->drawflag |= ME_DRAWSEAMS;
@@ -1487,7 +1487,7 @@
break;
}
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
return TRUE;
}
@@ -1644,7 +1644,7 @@
return 1;
}
-static int mouse_mesh_shortest_path_face(bContext *C, ViewContext *vc)
+static int mouse_mesh_shortest_path_face(ViewContext *vc)
{
BMEditMesh *em = vc->em;
BMFace *f_dst;
@@ -1678,7 +1678,7 @@
BM_active_face_set(em->bm, f_dst);
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
return TRUE;
}
@@ -1703,7 +1703,7 @@
em = vc.em;
if (em->selectmode & SCE_SELECT_EDGE) {
- if (mouse_mesh_shortest_path_edge(C, &vc)) {
+ if (mouse_mesh_shortest_path_edge(&vc)) {
return OPERATOR_FINISHED;
}
else {
@@ -1711,7 +1711,7 @@
}
}
else if (em->selectmode & SCE_SELECT_FACE) {
- if (mouse_mesh_shortest_path_face(C, &vc)) {
+ if (mouse_mesh_shortest_path_face(&vc)) {
return OPERATOR_FINISHED;
}
else {
@@ -2635,7 +2635,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, FALSE, FALSE);
+ EDBM_update_generic(em, FALSE, FALSE);
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_slide.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -264,7 +264,7 @@
EDBM_selectmode_flush(em);
/* NC_GEOM | ND_DATA & Retess */
- EDBM_update_generic(C, em, TRUE, FALSE);
+ EDBM_update_generic(em, TRUE, FALSE);
ED_region_tag_redraw(vso->active_region);
}
@@ -752,7 +752,7 @@
if (do_update) {
/* Update Geometry */
- EDBM_update_generic(C, em, TRUE, FALSE);
+ EDBM_update_generic(em, TRUE, FALSE);
}
return OPERATOR_FINISHED;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-12 15:01:27 UTC (rev 52931)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-12 15:22:54 UTC (rev 52932)
@@ -112,7 +112,7 @@
RNA_boolean_get(op->ptr, "quadtri"), TRUE, FALSE,
RNA_int_get(op->ptr, "seed"));
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -181,7 +181,7 @@
}
EDBM_selectmode_flush(em);
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -463,7 +463,7 @@
EDBM_mesh_normals_update(em);
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -585,7 +585,7 @@
* done.*/
EDBM_mesh_normals_update(em);
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -678,7 +678,7 @@
edbm_extrude_discrete_faces(em, op, BM_ELEM_SELECT, nor);
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -936,7 +936,7 @@
* done. */
EDBM_mesh_normals_update(vc.em);
- EDBM_update_generic(C, vc.em, TRUE, TRUE);
+ EDBM_update_generic(vc.em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1001,7 +1001,7 @@
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1034,7 +1034,7 @@
if (!EDBM_op_callf(em, op, "collapse edges=%he", BM_ELEM_SELECT))
return OPERATOR_CANCELLED;
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1062,7 +1062,7 @@
if (!EDBM_op_callf(em, op, "dissolve_edge_loop edges=%he", BM_ELEM_SELECT))
return OPERATOR_CANCELLED;
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1121,7 +1121,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1176,7 +1176,7 @@
}
ED_uvedit_live_unwrap(scene, obedit);
- EDBM_update_generic(C, em, TRUE, FALSE);
+ EDBM_update_generic(em, TRUE, FALSE);
return OPERATOR_FINISHED;
}
@@ -1230,7 +1230,7 @@
}
}
- EDBM_update_generic(C, em, TRUE, FALSE);
+ EDBM_update_generic(em, TRUE, FALSE);
return OPERATOR_FINISHED;
}
@@ -1272,7 +1272,7 @@
else {
EDBM_selectmode_flush(em); /* so newly created edges get the selection state from the vertex */
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
}
@@ -1310,7 +1310,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return len ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
}
@@ -1349,7 +1349,7 @@
return OPERATOR_CANCELLED;
}
- EDBM_update_generic(C, em, TRUE, TRUE);
+ EDBM_update_generic(em, TRUE, TRUE);
return OPERATOR_FINISHED;
}
@@ -1388,7 +1388,7 @@
if (!EDBM_op_callf(em, op, "reverse_faces faces=%hf", BM_ELEM_SELECT))
return OPERATOR_CANCELLED;
- EDBM_update_generic(C, em, TRUE, FALSE);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list