From 1844160a221cc4df36d8f465f8904c8689099490 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 Jul 2015 16:20:22 +1000 Subject: DerivedMesh: cleanup & minor edirs - place return args last position - move crazyspace function out of DerivedMesh header - use bool for args - flow control on own lines to ease debugging --- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/space_view3d/drawobject.c | 5 +++-- source/blender/editors/transform/transform_conversions.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index c2d2bffbbe5..560dacf72b2 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -145,7 +145,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) /* derivedMesh might be needed for solving parenting, * so re-create it here */ - makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, 0); + makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, false); BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 8cca1c8b1ef..56de06bedac 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4310,8 +4310,9 @@ static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3 if (obedit != ob) finalDM = cageDM = editbmesh_get_derived_base(ob, em); else - cageDM = editbmesh_get_derived_cage_and_final(scene, ob, em, &finalDM, - scene->customdata_mask); + cageDM = editbmesh_get_derived_cage_and_final( + scene, ob, em, scene->customdata_mask, + &finalDM); DM_update_materials(finalDM, ob); if (cageDM != finalDM) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index cae1fca9a79..80d8ce67b75 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2371,7 +2371,7 @@ static void createTransEditVerts(TransInfo *t) if (modifiers_isCorrectableDeformed(t->scene, t->obedit)) { /* check if we can use deform matrices for modifier from the * start up to stack, they are more accurate than quats */ - totleft = editbmesh_get_first_deform_matrices(t->scene, t->obedit, em, &defmats, &defcos); + totleft = BKE_crazyspace_get_first_deform_matrices_editbmesh(t->scene, t->obedit, em, &defmats, &defcos); } /* if we still have more modifiers, also do crazyspace diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index b2c4970479a..9431d754b5f 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -598,7 +598,9 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) /* first try existing derivedmesh */ if (!draw_uvs_dm_shadow(em->derivedFinal)) { /* create one if it does not exist */ - cagedm = editbmesh_get_derived_cage_and_final(scene, obedit, me->edit_btmesh, &finaldm, CD_MASK_BAREMESH | CD_MASK_MTFACE); + cagedm = editbmesh_get_derived_cage_and_final( + scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH | CD_MASK_MTFACE, + &finaldm); /* when sync selection is enabled, all faces are drawn (except for hidden) * so if cage is the same as the final, theres no point in drawing this */ -- cgit v1.2.3