Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 13:38:53 +0000 (23:38 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Sep 2018 13:38:53 +0000 (23:38 +1000)
1  2 
source/blender/editors/undo/ed_undo.c

@@@ -112,9 -105,7 +112,8 @@@ static int ed_undo_step(bContext *C, in
  {
        CLOG_INFO(&LOG, 1, "name='%s', step=%d", undoname, step);
        wmWindowManager *wm = CTX_wm_manager(C);
-       wmWindow *win = CTX_wm_window(C);
        Scene *scene = CTX_data_scene(C);
 +      ScrArea *sa = CTX_wm_area(C);
  
        /* undo during jobs are running can easily lead to freeing data using by jobs,
         * or they can just lead to freezing job in some other cases */
        WM_event_add_notifier(C, NC_WINDOW, NULL);
        WM_event_add_notifier(C, NC_WM | ND_UNDO, NULL);
  
-       if (win) {
-               win->addmousemove = true;
-       }
 +      Main *bmain = CTX_data_main(C);
 +      WM_toolsystem_refresh_screen_all(bmain);
 +
        return OPERATOR_FINISHED;
  }