diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-07-19 05:02:16 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-07-19 05:02:16 +0300 |
| commit | 34a45c54e00c18da06df97674e1d614c24ae58bf (patch) | |
| tree | 59d5a82129e8df713f4284cfe456ee66162bbb38 /source/blender/editors/interface | |
| parent | c05a8460a6493429a8bd08973eec4615ed0c066f (diff) | |
| parent | 51f14cfa43e5fe4bdea6fbd5c668a44919657f99 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_eyedropper_color.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index ff8aa56f0d5..bcce70d9d8a 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -297,7 +297,7 @@ static int eyedropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED( } else { eyedropper_exit(C, op); - return OPERATOR_CANCELLED; + return OPERATOR_PASS_THROUGH; } } @@ -315,7 +315,7 @@ static int eyedropper_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } else { - return OPERATOR_CANCELLED; + return OPERATOR_PASS_THROUGH; } } |