diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 17:22:06 +0300 |
commit | 36a9436d808837110a9c1bb2ec897a358ea62d56 (patch) | |
tree | 9cea3795c43b6ddca4706f883ebef3e5235669f9 /source/blender/editors/space_clip/clip_buttons.c | |
parent | bc95c7a3ea6fbcfbee43bd61c0a709de0d0daf26 (diff) | |
parent | ddee0931b8687d01186f1941d483c6b3622d1833 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_clip/clip_buttons.c')
-rw-r--r-- | source/blender/editors/space_clip/clip_buttons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index f2fe06874d7..db5f6c2451c 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -77,7 +77,7 @@ void ED_clip_buttons_register(ARegionType *UNUSED(art)) /********************* MovieClip Template ************************/ -void uiTemplateMovieClip(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, int compact) +void uiTemplateMovieClip(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, bool compact) { PropertyRNA *prop; PointerRNA clipptr; @@ -333,7 +333,7 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event) } void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, PointerRNA *userptr, - PointerRNA *trackptr, int compact) + PointerRNA *trackptr, bool compact) { PropertyRNA *prop; uiBlock *block; |