diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-04 13:31:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-04 13:31:33 +0400 |
| commit | 69b8b1646472de56b588f16efee8ba38a73bab24 (patch) | |
| tree | 411e4f3bf16aef22b453cbd93a4dd227e0544a01 /source/blender/editors | |
| parent | a51b5c676ec6aa64cb1940371b5760fe140d4db7 (diff) | |
rename poll functions from r57986, also no need to count the list to check if its empty.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 909b70c8d3c..bda69af3513 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2910,13 +2910,13 @@ static int vertex_group_poll(bContext *C) Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; - return (ob && !ob->id.lib - && data && !data->lib - && OB_TYPE_SUPPORT_VGROUP(ob->type) - && BLI_countlist(&ob->defbase) > 0 ); + return (ob && !ob->id.lib && + data && !data->lib && + OB_TYPE_SUPPORT_VGROUP(ob->type) && + ob->defbase.first); } -static int vertex_group_can_add_poll(bContext *C) +static int vertex_group_supported_poll(bContext *C) { Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; @@ -2928,13 +2928,13 @@ static int vertex_group_mesh_poll(bContext *C) Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; - return (ob && !ob->id.lib - && data && !data->lib - && ob->type == OB_MESH - && BLI_countlist(&ob->defbase) > 0 ); + return (ob && !ob->id.lib && + data && !data->lib && + ob->type == OB_MESH && + ob->defbase.first); } -static int vertex_group_mesh_can_add_poll(bContext *C) +static int vertex_group_mesh_supported_poll(bContext *C) { Object *ob = ED_object_context(C); ID *data = (ob) ? ob->data : NULL; @@ -3026,7 +3026,7 @@ void OBJECT_OT_vertex_group_add(wmOperatorType *ot) ot->description = "Add a new vertex group to the active object"; /* api callbacks */ - ot->poll = vertex_group_can_add_poll; + ot->poll = vertex_group_supported_poll; ot->exec = vertex_group_add_exec; /* flags */ @@ -3843,7 +3843,7 @@ void OBJECT_OT_vertex_group_transfer_weight(wmOperatorType *ot) ot->description = "Transfer weight paint to active from selected mesh"; /* API callbacks.*/ - ot->poll = vertex_group_mesh_can_add_poll; + ot->poll = vertex_group_mesh_supported_poll; ot->exec = vertex_group_transfer_weight_exec; /* Flags.*/ |