diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
| commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
| tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/editors/space_nla/nla_ops.c | |
| parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
| parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_nla/nla_ops.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 8109cff58fb..952fba095ff 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -52,7 +52,7 @@ /* ************************** poll callbacks for operators **********************************/ /* tweakmode is NOT enabled */ -int nlaop_poll_tweakmode_off(bContext *C) +bool nlaop_poll_tweakmode_off(bContext *C) { Scene *scene; @@ -74,7 +74,7 @@ int nlaop_poll_tweakmode_off(bContext *C) } /* tweakmode IS enabled */ -int nlaop_poll_tweakmode_on(bContext *C) +bool nlaop_poll_tweakmode_on(bContext *C) { Scene *scene; |