Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_handlers.c
index ce93e5df6d26d6f6f9a7fda33159bc54aa7bd6a6..7cad790ab349c5a519b2ce87ad79c80de0ccb403 100644 (file)
@@ -7721,7 +7721,8 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
                if (ui_but_is_cursor_warp(but)) {
 
 #ifdef USE_CONT_MOUSE_CORRECT
-                       if (data->ungrab_mval[0] != FLT_MAX) {
+                       /* stereo3d has issues with changing cursor location so rather avoid */
+                       if (data->ungrab_mval[0] != FLT_MAX && !WM_stereo3d_enabled(data->window, false)) {
                                int mouse_ungrab_xy[2];
                                ui_block_to_window_fl(data->region, but->block, &data->ungrab_mval[0], &data->ungrab_mval[1]);
                                mouse_ungrab_xy[0] = data->ungrab_mval[0];