diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 05:41:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 05:41:56 +0400 |
commit | 42076f0a1f46d165cf0eae364a3e3ebb3f870edc (patch) | |
tree | af89c62c31339c37c21bf8d759a3551bc52e8e2f /source | |
parent | a308b6c0ec070ac3813849c670b077641e9071a2 (diff) |
skip using bmesh operators for converting to/from undo meshes (gives some speedup)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 26 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_hook.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
10 files changed, 24 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index b14805a5e46..ed2b71cdb52 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -556,7 +556,7 @@ BMesh *BKE_mesh_to_bmesh(Mesh *me, Object *ob) bm = BM_mesh_create(&bm_mesh_allocsize_default); - BMO_op_callf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%b", me, ob, TRUE); + BM_mesh_bm_from_me(bm, me, TRUE, ob->shapenr); return bm; } diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 71bce196ddf..5b61fc01645 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -110,7 +110,7 @@ void EDBM_mesh_normals_update(struct BMEditMesh *em); void EDBM_mesh_make(struct ToolSettings *ts, struct Scene *scene, struct Object *ob); void EDBM_mesh_free(struct BMEditMesh *tm); -void EDBM_mesh_load(struct Scene *scene, struct Object *ob); +void EDBM_mesh_load(struct Object *ob); void EDBM_index_arrays_init(struct BMEditMesh *em, int forvert, int foredge, int forface); void EDBM_index_arrays_free(struct BMEditMesh *em); diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index e5a9cb98377..b9a75729a8a 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -301,12 +301,12 @@ void EDBM_mesh_make(ToolSettings *ts, Scene *UNUSED(scene), Object *ob) me->edit_btmesh->ob = ob; } -void EDBM_mesh_load(Scene *scene, Object *ob) +void EDBM_mesh_load(Object *ob) { Mesh *me = ob->data; BMesh *bm = me->edit_btmesh->bm; - BMO_op_callf(bm, "object_load_bmesh scene=%p object=%p", scene, ob); + BM_mesh_bm_to_me(bm, me, FALSE); #ifdef USE_TESSFACE_DEFAULT BKE_mesh_tessface_calc(me); @@ -552,7 +552,11 @@ static void undoMesh_to_editbtMesh(void *umv, void *em_v, void *UNUSED(obdata)) BMEdit_Free(em); bm = BM_mesh_create(&bm_mesh_allocsize_default); - BMO_op_callf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%b", &um->me, ob, FALSE); + + BM_mesh_bm_from_me(bm, &um->me, FALSE, ob->shapenr); + + /* face normals need recalculation since we are not calling through an operator */ + BM_mesh_normals_update(bm, TRUE); em_tmp = BMEdit_Create(bm, TRUE); *em = *em_tmp; @@ -563,16 +567,16 @@ static void undoMesh_to_editbtMesh(void *umv, void *em_v, void *UNUSED(obdata)) MEM_freeN(em_tmp); } - -static void free_undo(void *umv) +static void free_undo(void *me_v) { - if (((Mesh *)umv)->key) { - free_key(((Mesh *)umv)->key); - MEM_freeN(((Mesh *)umv)->key); + Mesh *me = me_v; + if (me->key) { + free_key(me->key); + MEM_freeN(me->key); } - - free_mesh(umv, 0); - MEM_freeN(umv); + + free_mesh(me, FALSE); + MEM_freeN(me); } /* and this is all the undo system needs to know */ diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index c58761e9173..0ede2baf9f6 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -614,7 +614,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) ED_uvedit_assign_image(bmain, scene, obedit, ima, NULL); if (exitmode) { - EDBM_mesh_load(scene, obedit); + EDBM_mesh_load(obedit); EDBM_mesh_free(me->edit_btmesh); MEM_freeN(me->edit_btmesh); me->edit_btmesh = NULL; diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index f6fd4b45288..37922b6e693 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -543,7 +543,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) #else /* toggle editmode using lower level functions so this can be called from python */ EDBM_mesh_make(scene->toolsettings, scene, ob); - EDBM_mesh_load(scene, ob); + EDBM_mesh_load(ob); EDBM_mesh_free(me->edit_btmesh); MEM_freeN(me->edit_btmesh); me->edit_btmesh = NULL; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index c40ea73d543..54207e0a598 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -327,7 +327,7 @@ void ED_object_exit_editmode(bContext *C, int flag) return; } - EDBM_mesh_load(scene, obedit); + EDBM_mesh_load(obedit); if (freedata) { EDBM_mesh_free(me->edit_btmesh); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index bdb53e25a07..4e967b6791b 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -308,7 +308,7 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int * BMEditMesh *em; - EDBM_mesh_load(scene, obedit); + EDBM_mesh_load(obedit); EDBM_mesh_make(scene->toolsettings, scene, obedit); em = me->edit_btmesh; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f9b0cfeedb8..a6fb946c83f 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -128,7 +128,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) Mesh *me= obedit->data; BMEditMesh *em; - EDBM_mesh_load(scene, obedit); + EDBM_mesh_load(obedit); EDBM_mesh_make(scene->toolsettings, scene, obedit); em= me->edit_btmesh; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 574d9877cfb..71a826f1351 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -228,7 +228,7 @@ void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr) /* exit/enter editmode to get new shape */ switch (ob->type) { case OB_MESH: - EDBM_mesh_load(scene, ob); + EDBM_mesh_load(ob); EDBM_mesh_make(scene->toolsettings, scene, ob); BMEdit_RecalcTessellation(((Mesh*)ob->data)->edit_btmesh); break; diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 682c671f520..503fa94f527 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -116,7 +116,7 @@ struct wmWindowManager; /*new render funcs */ void EDBM_selectmode_set(struct BMEditMesh *em) {} -void EDBM_mesh_load(struct Scene *scene, struct Object *ob) {} +void EDBM_mesh_load(struct Object *ob) {} void EDBM_mesh_make(struct ToolSettings *ts, struct Scene *scene, struct Object *ob) {} void *g_system; |