[Bf-blender-cvs] [d2063f7bc35] master: Fix edit-mode interfering with brush swap color

[Campbell Barton]

Commit: d2063f7bc35ee9bb3f01e6cb9f5ca4b09d414bff
Author: Campbell Barton
Date:   Tue Jul 30 15:37:45 2019 +1000
Branches: master
https://developer.blender.org/rBd2063f7bc35ee9bb3f01e6cb9f5ca4b09d414bff

Fix edit-mode interfering with brush swap color

D5353 by @robert-wallis

===================================================================

M	source/blender/editors/sculpt_paint/paint_image.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 41dfd6f68c3..a0f578c04d0 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -1246,8 +1246,7 @@ static int brush_colors_flip_exec(bContext *C, wmOperator *UNUSED(op))
   Scene *scene = CTX_data_scene(C);
   UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
 
-  ViewLayer *view_layer = CTX_data_view_layer(C);
-  Paint *paint = BKE_paint_get_active(scene, view_layer);
+  Paint *paint = BKE_paint_get_active_from_context(C);
   Brush *br = BKE_paint_brush(paint);
 
   if (ups->flag & UNIFIED_PAINT_COLOR) {
@@ -1256,6 +1255,10 @@ static int brush_colors_flip_exec(bContext *C, wmOperator *UNUSED(op))
   else if (br) {
     swap_v3_v3(br->rgb, br->secondary_rgb);
   }
+  else {
+    return OPERATOR_CANCELLED;
+  }
+
   WM_event_add_notifier(C, NC_BRUSH | NA_EDITED, br);
 
   return OPERATOR_FINISHED;