griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revert r36440, own commit, no longer needed because of changes to the keymap.

Browse Source 
resolves [#36860] sampling color in face select mask
This commit is contained in:
Campbell Barton
2013-09-30 09:04:17 +00:00
parent 8064989e7b
commit 65233bc49e
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/sculpt_paint/paint_image.c
View 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;