[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29731] trunk/blender/source/blender/ editors/object/object_edit.c: Fix [#22675] Dupli tool

[Matt Ebb]

Revision: 29731
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29731
Author:   broken
Date:     2010-06-27 08:15:36 +0200 (Sun, 27 Jun 2010)

Log Message:
-----------
Fix [#22675] Dupli tool
Tweaked operator poll functions

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2010-06-27 06:08:22 UTC (rev 29730)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2010-06-27 06:15:36 UTC (rev 29731)
@@ -1792,6 +1792,11 @@
 	return (done)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
 }
 
+static int shade_poll(bContext *C)
+{
+	return (ED_operator_object_active_editable(C) && !ED_operator_editmesh(C));
+}
+
 void OBJECT_OT_shade_flat(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -1799,7 +1804,7 @@
 	ot->idname= "OBJECT_OT_shade_flat";
 	
 	/* api callbacks */
-	ot->poll= ED_operator_object_active_editable;
+	ot->poll= shade_poll;
 	ot->exec= shade_smooth_exec;
 
 	/* flags */
@@ -1813,7 +1818,7 @@
 	ot->idname= "OBJECT_OT_shade_smooth";
 	
 	/* api callbacks */
-	ot->poll= ED_operator_object_active_editable;
+	ot->poll= shade_poll;
 	ot->exec= shade_smooth_exec;
 	
 	/* flags */