archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-02 12:03:56 +02:00
parent ad5a20efce b88e51dd55
commit b076b3853c
190 changed files with 611 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_image/image_edit.c
View File

@@ -388,7 +388,7 @@ bool ED_space_image_check_show_maskedit(SpaceImage *sima, ViewLayer *view_layer)
return (sima->mode == SI_MODE_MASK);
}
int ED_space_image_maskedit_poll(bContext *C)
bool ED_space_image_maskedit_poll(bContext *C)
{
SpaceImage *sima = CTX_wm_space_image(C);
@@ -415,7 +415,7 @@ bool ED_space_image_paint_curve(const bContext *C)
}
int ED_space_image_maskedit_mask_poll(bContext *C)
bool ED_space_image_maskedit_mask_poll(bContext *C)
{
if (ED_space_image_maskedit_poll(C)) {
SpaceImage *sima = CTX_wm_space_image(C);