[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57986] trunk/blender/source/blender/ editors/object/object_vgroup.c: Moved 'vgroups exist' check into operator poll functions of weight tools

[Gaia Clary]

Revision: 57986
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57986
Author:   gaiaclary
Date:     2013-07-04 08:47:42 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Moved 'vgroups exist' check into operator poll functions of weight tools

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 06:20:01 UTC (rev 57985)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-07-04 08:47:42 UTC (rev 57986)
@@ -2909,6 +2909,17 @@
 {
 	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 );
+}
+
+static int vertex_group_can_add_poll(bContext *C)
+{
+	Object *ob = ED_object_context(C);
+	ID *data = (ob) ? ob->data : NULL;
 	return (ob && !ob->id.lib && OB_TYPE_SUPPORT_VGROUP(ob->type) && data && !data->lib);
 }
 
@@ -2916,9 +2927,21 @@
 {
 	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 );
+}
+
+static int vertex_group_mesh_can_add_poll(bContext *C)
+{
+	Object *ob = ED_object_context(C);
+	ID *data = (ob) ? ob->data : NULL;
 	return (ob && !ob->id.lib && ob->type == OB_MESH && data && !data->lib);
 }
 
+
 static int UNUSED_FUNCTION(vertex_group_poll_edit) (bContext *C)
 {
 	Object *ob = ED_object_context(C);
@@ -3003,7 +3026,7 @@
 	ot->description = "Add a new vertex group to the active object";
 	
 	/* api callbacks */
-	ot->poll = vertex_group_poll;
+	ot->poll = vertex_group_can_add_poll;
 	ot->exec = vertex_group_add_exec;
 
 	/* flags */
@@ -3820,7 +3843,7 @@
 	ot->description = "Transfer weight paint to active from selected mesh";
 
 	/* API callbacks.*/
-	ot->poll = vertex_group_mesh_poll;
+	ot->poll = vertex_group_mesh_can_add_poll;
 	ot->exec = vertex_group_transfer_weight_exec;
 
 	/* Flags.*/