[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60432] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: revert r36440, own commit, no longer needed because of changes to the keymap.

[Campbell Barton]

Revision: 60432
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60432
Author:   campbellbarton
Date:     2013-09-30 09:04:17 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
revert r36440, own commit, no longer needed because of changes to the keymap.
resolves [#36860] sampling color in face select mask

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36440

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2013-09-30 08:43:22 UTC (rev 60431)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2013-09-30 09:04:17 UTC (rev 60432)
@@ -963,26 +963,6 @@
 	return OPERATOR_RUNNING_MODAL;
 }
 
-/* same as image_paint_poll but fail when face mask mode is enabled */
-static int image_paint_sample_color_poll(bContext *C)
-{
-	if (image_paint_poll(C)) {
-		if (CTX_wm_view3d(C)) {
-			Object *obact = CTX_data_active_object(C);
-			if (obact && obact->mode & OB_MODE_TEXTURE_PAINT) {
-				Mesh *me = BKE_mesh_from_object(obact);
-				if (me) {
-					return !(me->editflag & ME_EDIT_PAINT_FACE_SEL);
-				}
-			}
-		}
-
-		return 1;
-	}
-
-	return 0;
-}
-
 void PAINT_OT_sample_color(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -994,7 +974,7 @@
 	ot->exec = sample_color_exec;
 	ot->invoke = sample_color_invoke;
 	ot->modal = sample_color_modal;
-	ot->poll = image_paint_sample_color_poll;
+	ot->poll = image_paint_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;