Commit: 54a7adbe795c97cf27127df807145e3c8d87d921
Author: YimingWu
Date:   Wed Aug 26 20:31:34 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB54a7adbe795c97cf27127df807145e3c8d87d921

LineArt: Prevent crash when using any sort of moving operators.

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

M       source/blender/editors/lineart/lineart_cpu.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c 
b/source/blender/editors/lineart/lineart_cpu.c
index cab367e528b..c30389f9568 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -4068,8 +4068,12 @@ void ED_lineart_update_render_progress(int nr, const 
char *info)
       WM_progress_clear(lineart_share.main_window);
     }
     else {
-      WM_cursor_time(lineart_share.main_window, nr);
-      WM_progress_set(lineart_share.main_window, (float)nr / 100);
+      /* Hack: this prevents XWindow cursor error crashes when this thread and 
an operator is
+       * setting cursor at the same time. */
+      if (!G.moving) {
+        WM_cursor_time(lineart_share.main_window, nr);
+        WM_progress_set(lineart_share.main_window, (float)nr / 100);
+      }
     }
   }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to