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

10
source/blender/editors/space_clip/clip_editor.c
View File

@@ -76,7 +76,7 @@
/* ******** operactor poll functions ******** */
int ED_space_clip_poll(bContext *C)
bool ED_space_clip_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -86,7 +86,7 @@ int ED_space_clip_poll(bContext *C)
return false;
}
int ED_space_clip_view_clip_poll(bContext *C)
bool ED_space_clip_view_clip_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -97,7 +97,7 @@ int ED_space_clip_view_clip_poll(bContext *C)
return false;
}
int ED_space_clip_tracking_poll(bContext *C)
bool ED_space_clip_tracking_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -107,7 +107,7 @@ int ED_space_clip_tracking_poll(bContext *C)
return false;
}
int ED_space_clip_maskedit_poll(bContext *C)
bool ED_space_clip_maskedit_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -118,7 +118,7 @@ int ED_space_clip_maskedit_poll(bContext *C)
return false;
}
int ED_space_clip_maskedit_mask_poll(bContext *C)
bool ED_space_clip_maskedit_mask_poll(bContext *C)
{
if (ED_space_clip_maskedit_poll(C)) {
MovieClip *clip = CTX_data_edit_movieclip(C);