Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_eyedropper_color.c
index ff8aa56f0d5a1e96e0ecf518cb714280a3b4ee12..bcce70d9d8a6df30ca2b20e26661003e292740ea 100644 (file)
@@ -297,7 +297,7 @@ static int eyedropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
        }
        else {
                eyedropper_exit(C, op);
        }
        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_FINISHED;
        }
        else {
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        }
 }
 
        }
 }