diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/editors/object/object_hook.c | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/object/object_hook.c')
| -rw-r--r-- | source/blender/editors/object/object_hook.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 7bb2be8e248..4e967b6791b 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -308,8 +308,8 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int * BMEditMesh *em; - EDBM_LoadEditBMesh(scene, obedit); - EDBM_MakeEditBMesh(scene->toolsettings, scene, obedit); + EDBM_mesh_load(obedit); + EDBM_mesh_make(scene->toolsettings, scene, obedit); em = me->edit_btmesh; |