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/interface/interface_eyedropper_color.c | |
parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_color.c')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper_color.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index a60b6f3f60b..73efc59feb7 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -319,7 +319,7 @@ static int eyedropper_exec(bContext *C, wmOperator *op) } } -static int eyedropper_poll(bContext *C) +static bool eyedropper_poll(bContext *C) { PointerRNA ptr; PropertyRNA *prop; |