Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
committerRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
1  2 
source/blender/editors/interface/interface_eyedropper_color.c

index ff8aa56f0d5a1e96e0ecf518cb714280a3b4ee12,5eb4359607a43919dedc2529fe565e6fc76576f0..bcce70d9d8a6df30ca2b20e26661003e292740ea
@@@ -137,8 -137,8 +137,8 @@@ void eyedropper_color_sample_fl(bContex
  {
        /* we could use some clever */
        Main *bmain = CTX_data_main(C);
 -      wmWindow *win = CTX_wm_window(C);
 -      ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, mx, my);
 +      bScreen *screen = CTX_wm_screen(C);
 +      ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mx, my);
        const char *display_device = CTX_data_scene(C)->display_settings.display_device;
        struct ColorManagedDisplay *display = IMB_colormanagement_display_get_named(display_device);
  
@@@ -297,7 -297,7 +297,7 @@@ static int eyedropper_invoke(bContext *
        }
        else {
                eyedropper_exit(C, op);
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        }
  }
  
@@@ -315,7 -315,7 +315,7 @@@ static int eyedropper_exec(bContext *C
                return OPERATOR_FINISHED;
        }
        else {
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        }
  }