revert r36440, own commit, no longer needed because of changes to the keymap.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 30 Sep 2013 09:04:17 +0000 (09:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 30 Sep 2013 09:04:17 +0000 (09:04 +0000)
resolves [#36860] sampling color in face select mask

source/blender/editors/sculpt_paint/paint_image.c

index feff02fa121c3fce0f0ee4c05509fcea0dce18a5..a32293ab12b693ea8b78935aad68ab4a8a512c25 100644 (file)
@@ -963,26 +963,6 @@ static int sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event)
        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 @@ void PAINT_OT_sample_color(wmOperatorType *ot)
        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;