[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57990] trunk/blender/source/blender/ editors/object/object_vgroup.c: rename poll functions from r57986, also no need to count the list to check if its empty.
Campbell Barton
ideasman42 at gmail.com
Thu Jul 4 11:31:33 CEST 2013
Revision: 57990
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57990
Author: campbellbarton
Date: 2013-07-04 09:31:33 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
rename poll functions from r57986, also no need to count the list to check if its empty.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57986
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_vgroup.c
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2013-07-04 09:23:21 UTC (rev 57989)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2013-07-04 09:31:33 UTC (rev 57990)
@@ -2910,13 +2910,13 @@
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 @@
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 @@
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 @@
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.*/
More information about the Bf-blender-cvs
mailing list