Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-11-17 22:33:25 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2014-11-17 22:33:25 +0300
commit1e5d5085675afd1c3d6e0191e668449217f733ed (patch)
treeb18988f0f578b0a7bee871472398a6ef5ebf69f4 /source/blender/editors/object
parent7019c2bb7f9b8fd27e8f0cc5b72b262e2de584a9 (diff)
Cleanup: Shapekey: get rid of `ED_vgroup_object_is_edit_mode()`
It was doing exactly the same thing as `BKE_object_is_in_editmode_vgroup()`, tsst...
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_vgroup.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index b7f121d52dd..672dcb47d92 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -126,16 +126,6 @@ bool ED_vgroup_sync_from_pose(Object *ob)
return false;
}
-bool ED_vgroup_object_is_edit_mode(Object *ob)
-{
- if (ob->type == OB_MESH)
- return (BKE_editmesh_from_object(ob) != NULL);
- else if (ob->type == OB_LATTICE)
- return (((Lattice *)ob->data)->editlatt != NULL);
-
- return false;
-}
-
bDeformGroup *ED_vgroup_add_name(Object *ob, const char *name)
{
bDeformGroup *defgroup;
@@ -159,7 +149,7 @@ void ED_vgroup_delete(Object *ob, bDeformGroup *defgroup)
{
BLI_assert(BLI_findindex(&ob->defbase, defgroup) != -1);
- if (ED_vgroup_object_is_edit_mode(ob))
+ if (BKE_object_is_in_editmode_vgroup(ob))
vgroup_delete_edit_mode(ob, defgroup);
else
vgroup_delete_object_mode(ob, defgroup);
@@ -168,7 +158,7 @@ void ED_vgroup_delete(Object *ob, bDeformGroup *defgroup)
void ED_vgroup_clear(Object *ob)
{
bDeformGroup *dg = (bDeformGroup *)ob->defbase.first;
- int edit_mode = ED_vgroup_object_is_edit_mode(ob);
+ int edit_mode = BKE_object_is_in_editmode_vgroup(ob);
while (dg) {
bDeformGroup *next_dg = dg->next;