Merge branch 'blender-v4.0-release'

scripts/startup/bl_ui/properties_data_armature.py

@@ -39,8 +39,8 @@ class DATA_PT_context_arm(ArmatureButtonsPanel, Panel):
             layout.template_ID(space, "pin_id")
 
 
-class DATA_PT_skeleton(ArmatureButtonsPanel, Panel):
-    bl_label = "Skeleton"
+class DATA_PT_pose(ArmatureButtonsPanel, Panel):
+    bl_label = "Pose"
 
     def draw(self, context):
         layout = self.layout
@@ -287,7 +287,7 @@ class DATA_PT_custom_props_bcoll(ArmatureButtonsPanel, PropertyPanel, Panel):
 
 classes = (
     DATA_PT_context_arm,
-    DATA_PT_skeleton,
+    DATA_PT_pose,
     DATA_PT_bone_collections,
     DATA_UL_bone_collections,
     ARMATURE_MT_collection_context_menu,

source/blender/windowmanager/intern/wm_files.cc

@@ -692,6 +692,8 @@ static void wm_file_read_post(bContext *C,
     CTX_wm_window_set(C, static_cast<wmWindow *>(wm->windows.first));
   }
 
+  WM_cursor_wait(true);
+
 #ifdef WITH_PYTHON
   if (is_startup_file) {
     /* On startup (by default), Python won't have been initialized.
@@ -818,6 +820,8 @@ static void wm_file_read_post(bContext *C,
       WM_toolsystem_init(C);
     }
   }
+
+  WM_cursor_wait(false);
 }
 
 static void wm_read_callback_pre_wrapper(bContext *C, const char *filepath)
@@ -1067,6 +1071,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
       bf_reports.duration.whole = PIL_check_seconds_timer() - bf_reports.duration.whole;
       file_read_reports_finalize(&bf_reports);
 
+      WM_cursor_wait(true);
       success = true;
     }
   }
@@ -1171,6 +1176,8 @@ void wm_homefile_read_ex(bContext *C,
   char filepath_startup[FILE_MAX];
   char filepath_userdef[FILE_MAX];
 
+  WM_cursor_wait(true);
+
   /* When 'app_template' is set:
    * '{BLENDER_USER_CONFIG}/{app_template}' */
   char app_template_system[FILE_MAX];
@@ -1488,6 +1495,8 @@ void wm_homefile_read_ex(bContext *C,
       CTX_wm_window_set(C, nullptr);
     }
   }
+
+  WM_cursor_wait(false);
 }
 
 void wm_homefile_read(bContext *C,