blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: simplify ED_imbuf_sample_poll 

Access the space data directly from the area.

Also remove redundant NULL check.
This commit is contained in:
Campbell Barton 2021-10-06 09:29:09 +11:00
parent 6d2b486e43
commit 26dac33ce1
Notes: blender-bot 2023-02-14 09:29:42 +01:00 
Referenced by issue #92743, Render border outside view OptiX denoising crash
Referenced by issue #91983, Blender 3.0: Apply Scale does not work properly on Curves.
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
source/blender/editors/util/ed_util_imbuf.c
View File

@ -535,37 +535,38 @@ void ED_imbuf_sample_cancel(bContext *C, wmOperator *op)
bool ED_imbuf_sample_poll(bContext *C)
{
ScrArea *sa = CTX_wm_area(C);
if (sa && sa->spacetype == SPACE_IMAGE) {
SpaceImage *sima = CTX_wm_space_image(C);
if (sima == NULL) {
return false;
}
Object *obedit = CTX_data_edit_object(C);
if (obedit) {
/* Disable when UV editing so it doesn't swallow all click events
* (use for setting cursor). */
if (ED_space_image_show_uvedit(sima, obedit)) {
return false;
}
}
else if (sima->mode != SI_MODE_VIEW) {
return false;
}
return true;
ScrArea *area = CTX_wm_area(C);
if (area == NULL) {
return false;
}
if (sa && sa->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = CTX_wm_space_seq(C);
if (sseq->mainb != SEQ_DRAW_IMG_IMBUF) {
return false;
switch (area->spacetype) {
case SPACE_IMAGE: {
SpaceImage *sima = area->spacedata.first;
Object *obedit = CTX_data_edit_object(C);
if (obedit) {
/* Disable when UV editing so it doesn't swallow all click events
* (use for setting cursor). */
if (ED_space_image_show_uvedit(sima, obedit)) {
return false;
}
}
else if (sima->mode != SI_MODE_VIEW) {
return false;
}
return true;
}
case SPACE_SEQ: {
SpaceSeq *sseq = area->spacedata.first;
return sseq && SEQ_editing_get(CTX_data_scene(C)) != NULL;
if (sseq->mainb != SEQ_DRAW_IMG_IMBUF) {
return false;
}
if (SEQ_editing_get(CTX_data_scene(C)) == NULL) {
return false;
}
return true;
}
}
return false;