[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50492] trunk/blender/source/blender: code cleanup: use BMEdit_FromObject() rather then me-> edit_btmesh in more places.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 10 05:34:46 CEST 2012
Revision: 50492
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50492
Author: campbellbarton
Date: 2012-09-10 03:34:43 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
code cleanup: use BMEdit_FromObject() rather then me->edit_btmesh in more places.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/makesdna/DNA_mesh_types.h
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -924,7 +924,7 @@
/* simple preventing of too deep nested groups */
if (level > MAX_DUPLI_RECUR) return;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(par);
if (em) {
dm = editbmesh_get_derived_cage(scene, par, em, CD_MASK_BAREMESH);
@@ -1050,7 +1050,7 @@
if (level > MAX_DUPLI_RECUR) return;
copy_m4_m4(pmat, par->obmat);
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(par);
if (em) {
dm = editbmesh_get_derived_cage(scene, par, em, CD_MASK_BAREMESH);
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -416,8 +416,7 @@
static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[][4])
{
DerivedMesh *dm = NULL;
- Mesh *me = ob->data;
- BMEditMesh *em = me->edit_btmesh;
+ BMEditMesh *em = BMEdit_FromObject(ob);
float vec[3] = {0.0f, 0.0f, 0.0f};
float normal[3] = {0.0f, 0.0f, 0.0f}, plane[3];
float imat[3][3], tmat[3][3];
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -1747,5 +1747,10 @@
BMEditMesh *BMEdit_FromObject(Object *ob)
{
BLI_assert(ob->type == OB_MESH);
+#ifndef NDEBUG
+// if (((Mesh *)ob->data)->edit_btmesh) {
+// BLI_assert(((Mesh *)ob->data)->edit_btmesh->me == ob->data);
+// }
+#endif
return ((Mesh *)ob->data)->edit_btmesh;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -97,7 +97,6 @@
static int add_primitive_plane_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -108,8 +107,7 @@
make_prim_init(C, "Plane", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout",
"create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, dia, mat))
@@ -143,7 +141,6 @@
static int add_primitive_cube_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -154,8 +151,7 @@
make_prim_init(C, "Cube", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout", "create_cube mat=%m4 size=%f", mat, dia * 2.0f)) {
return OPERATOR_CANCELLED;
@@ -194,7 +190,6 @@
static int add_primitive_circle_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -208,8 +203,7 @@
make_prim_init(C, "Circle", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout",
"create_circle segments=%i diameter=%f cap_ends=%b cap_tris=%b mat=%m4",
@@ -253,7 +247,6 @@
static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -267,8 +260,7 @@
make_prim_init(C, "Cylinder", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(
em, op, "vertout",
@@ -318,7 +310,6 @@
static int add_primitive_cone_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -332,8 +323,7 @@
make_prim_init(C, "Cone", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(
em, op, "vertout",
@@ -382,7 +372,6 @@
static int add_primitive_grid_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -393,8 +382,7 @@
make_prim_init(C, "Grid", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout",
"create_grid xsegments=%i ysegments=%i size=%f mat=%m4",
@@ -438,7 +426,6 @@
static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -452,8 +439,7 @@
make_prim_init(C, "Monkey", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout", "create_monkey mat=%m4", mat)) {
return OPERATOR_CANCELLED;
@@ -484,7 +470,6 @@
static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -495,8 +480,7 @@
make_prim_init(C, "Sphere", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "vertout",
"create_uvsphere segments=%i revolutions=%i diameter=%f mat=%m4",
@@ -540,7 +524,6 @@
static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
{
Object *obedit;
- Mesh *me;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
int enter_editmode;
@@ -551,8 +534,7 @@
make_prim_init(C, "Icosphere", &dia, mat, &state, loc, rot, layer);
obedit = CTX_data_edit_object(C);
- me = obedit->data;
- em = me->edit_btmesh;
+ em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(
em, op, "vertout",
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -2296,8 +2296,7 @@
view3d_set_viewcontext(C, vc);
if (vc->obedit) {
- Mesh *me = vc->obedit->data;
- vc->em = me->edit_btmesh;
+ vc->em = BMEdit_FromObject(vc->obedit);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -101,8 +101,8 @@
DAG_id_tag_update(obedit->data, 0);
if (obedit->type == OB_MESH) {
- Mesh *me = obedit->data;
- BM_mesh_normals_update(me->edit_btmesh->bm, TRUE); /* does face centers too */
+ BMEditMesh *em = BMEdit_FromObject(obedit);
+ BM_mesh_normals_update(em->bm, TRUE); /* does face centers too */
}
else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
Curve *cu = obedit->data;
@@ -229,8 +229,7 @@
zero_v3(centroid);
if (obedit->type == OB_MESH) {
- Mesh *me = obedit->data;
- BMEditMesh *em = me->edit_btmesh;
+ BMEditMesh *em = BMEdit_FromObject(obedit);
BMesh *bm = em->bm;
BMIter iter;
void *userdata[2] = {em, NULL};
@@ -992,11 +991,11 @@
if (obedit) {
if (obedit->type == OB_MESH) {
+ BMEditMesh *em = BMEdit_FromObject(obedit);
/* check active */
- Mesh *me = obedit->data;
BMEditSelection ese;
- if (BM_select_history_active_get(me->edit_btmesh->bm, &ese)) {
+ if (BM_select_history_active_get(em->bm, &ese)) {
BM_editselection_center(&ese, curs);
}
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -4753,8 +4753,7 @@
static int createSlideVerts(TransInfo *t)
{
- Mesh *me = t->obedit->data;
- BMEditMesh *em = me->edit_btmesh;
+ BMEditMesh *em = BMEdit_FromObject(t->obedit);
BMesh *bm = em->bm;
BMIter iter, iter2;
BMEdge *e, *e1;
Modified: trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-09-10 02:45:29 UTC (rev 50491)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-09-10 03:34:43 UTC (rev 50492)
@@ -565,8 +565,7 @@
ob = obedit;
if (ob->type == OB_MESH) {
- Mesh *me = ob->data;
- BMEditMesh *em = me->edit_btmesh;
+ BMEditMesh *em = BMEdit_FromObject(ob);
BMVert *eve;
BMEditSelection ese;
float vec[3] = {0, 0, 0};
Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h 2012-09-10 02:45:29 UTC (rev 50491)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list