[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26013] trunk/blender/source/blender/ editors: Tweaked/added poll functions to prevent operators that require

[Matt Ebb]

Revision: 26013
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26013
Author:   broken
Date:     2010-01-15 07:10:05 +0100 (Fri, 15 Jan 2010)

Log Message:
-----------
Tweaked/added poll functions to prevent operators that require
a 3D View from being used outside the 3D View (i.e. the info header 
search button)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/editarmature.c
    trunk/blender/source/blender/editors/mesh/editmesh_mods.c

Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-15 05:00:02 UTC (rev 26012)
+++ trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-15 06:10:05 UTC (rev 26013)
@@ -1486,6 +1486,11 @@
 	return OPERATOR_FINISHED;
 }
 
+static int pose_select_linked_poll(bContext *C)
+{
+	return ( ED_operator_view3d_active(C) && ED_operator_posemode(C) );
+}
+
 void POSE_OT_select_linked(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -1495,7 +1500,7 @@
 	/* api callbacks */
 	ot->exec= NULL;
 	ot->invoke= pose_select_connected_invoke;
-	ot->poll= ED_operator_posemode;
+	ot->poll= select_linked_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1580,6 +1585,11 @@
 	return OPERATOR_FINISHED;
 }
 
+static int armature_select_linked_poll(bContext *C)
+{
+	return ( ED_operator_view3d_active(C) && ED_operator_editarmature(C) );
+}
+
 void ARMATURE_OT_select_linked(wmOperatorType *ot)
 {
 	/* identifiers */

Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2010-01-15 05:00:02 UTC (rev 26012)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2010-01-15 06:10:05 UTC (rev 26013)
@@ -2111,7 +2111,7 @@
 	
 	/* api callbacks */
 	ot->invoke= mesh_select_loop_invoke;
-	ot->poll= ED_operator_editmesh;
+	ot->poll= ED_operator_editmesh_view3d;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2213,7 +2213,7 @@
 	
 	/* api callbacks */
 	ot->invoke= mesh_shortest_path_select_invoke;
-	ot->poll= ED_operator_editmesh;
+	ot->poll= ED_operator_editmesh_view3d;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2521,7 +2521,7 @@
 	
 	/* api callbacks */
 	ot->invoke= select_linked_pick_invoke;
-	ot->poll= ED_operator_editmesh;
+	ot->poll= ED_operator_editmesh_view3d;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;