Merge remote-tracking branch 'b/main'

UPBGE · Apr 22, 2024 · 18e4b60 · 18e4b60
2 parents 7b9343f + d44ee7b
commit 18e4b60
Show file tree

Hide file tree

Showing 263 changed files with 42,243 additions and 7,406 deletions.
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
@@ -788,6 +788,7 @@ typedef void (*GHOST_XrDrawViewFn)(const struct GHOST_XrDrawViewInfo *draw_view,
 typedef const GHOST_TXrGraphicsBinding *GHOST_XrGraphicsBindingCandidates;
 
 typedef struct {
+  bool is_active;
   float position[3];
   /* Blender convention (w, x, y, z) */
   float orientation_quat[4];

diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc
@@ -3616,15 +3616,15 @@ static void cursor_surface_handle_leave(void *data, wl_surface *wl_surface, wl_o
 }
 
 static void cursor_surface_handle_preferred_buffer_scale(void * /*data*/,
-                                                         struct wl_surface * /*wl_surface*/,
+                                                         wl_surface * /*wl_surface*/,
                                                          int32_t factor)
 {
   /* Only available in interface version 6. */
   CLOG_INFO(LOG, 2, "handle_preferred_buffer_scale (factor=%d)", factor);
 }
 
 static void cursor_surface_handle_preferred_buffer_transform(void * /*data*/,
-                                                             struct wl_surface * /*wl_surface*/,
+                                                             wl_surface * /*wl_surface*/,
                                                              uint32_t transform)
 {
   /* Only available in interface version 6. */
@@ -6143,13 +6143,13 @@ static void output_handle_scale(void *data, wl_output * /*wl_output*/, const int
   output->system->output_scale_update(output);
 }
 
-static void output_handle_name(void * /*data*/, struct wl_output * /*wl_output*/, const char *name)
+static void output_handle_name(void * /*data*/, wl_output * /*wl_output*/, const char *name)
 {
   /* Only available in interface version 4. */
   CLOG_INFO(LOG, 2, "name (%s)", name);
 }
 static void output_handle_description(void * /*data*/,
-                                      struct wl_output * /*wl_output*/,
+                                      wl_output * /*wl_output*/,
                                       const char *description)
 {
   /* Only available in interface version 4. */

diff --git a/intern/ghost/intern/GHOST_WindowWayland.cc b/intern/ghost/intern/GHOST_WindowWayland.cc
@@ -1197,7 +1197,7 @@ static void xdg_toplevel_handle_close(void *data, xdg_toplevel * /*xdg_toplevel*
 }
 
 static void xdg_toplevel_handle_configure_bounds(void *data,
-                                                 struct xdg_toplevel * /*xdg_toplevel*/,
+                                                 xdg_toplevel * /*xdg_toplevel*/,
                                                  int32_t width,
                                                  int32_t height)
 {
@@ -1213,8 +1213,8 @@ static void xdg_toplevel_handle_configure_bounds(void *data,
   }
 }
 static void xdg_toplevel_handle_wm_capabilities(void * /*data*/,
-                                                struct xdg_toplevel * /*xdg_toplevel*/,
-                                                struct wl_array * /*capabilities*/)
+                                                xdg_toplevel * /*xdg_toplevel*/,
+                                                wl_array * /*capabilities*/)
 {
   /* Only available in interface version 5. */
   CLOG_INFO(LOG, 2, "wm_capabilities");
@@ -1595,15 +1595,15 @@ static void surface_handle_leave(void *data, wl_surface * /*wl_surface*/, wl_out
 }
 
 static void surface_handle_preferred_buffer_scale(void * /*data*/,
-                                                  struct wl_surface * /*wl_surface*/,
+                                                  wl_surface * /*wl_surface*/,
                                                   int32_t factor)
 {
   /* Only available in interface version 6. */
   CLOG_INFO(LOG, 2, "handle_preferred_buffer_scale (factor=%d)", factor);
 }
 
 static void surface_handle_preferred_buffer_transform(void * /*data*/,
-                                                      struct wl_surface * /*wl_surface*/,
+                                                      wl_surface * /*wl_surface*/,
                                                       uint32_t transform)
 {
   /* Only available in interface version 6. */

diff --git a/intern/ghost/intern/GHOST_XrAction.cc b/intern/ghost/intern/GHOST_XrAction.cc
@@ -339,6 +339,7 @@ void GHOST_XrAction::updateState(XrSession session,
           CHECK_XR(xrGetActionStatePose(session, &state_info, &state),
                    (std::string("Failed to get state for pose action \"") + action_name + "\".")
                        .data());
+          ((GHOST_XrPose *)m_states)[subaction_idx].is_active = state.isActive;
           if (state.isActive) {
             XrSpace pose_space = ((subaction != nullptr) && (subaction->space != nullptr)) ?
                                      subaction->space->getSpace() :

diff --git a/intern/guardedalloc/intern/mallocn.cc b/intern/guardedalloc/intern/mallocn.cc
@@ -101,7 +101,7 @@ void aligned_free(void *ptr)
  * Helps catching issues (in debug build) caused by an unintended allocator type change when there
  * are allocation happened.
  */
-static void assert_for_allocator_change(void)
+static void assert_for_allocator_change()
 {
   /* NOTE: Assume that there is no "sticky" internal state which would make switching allocator
    * type after all allocations are freed unsafe. In fact, it should be safe to change allocator
@@ -110,7 +110,7 @@ static void assert_for_allocator_change(void)
   assert(MEM_get_memory_blocks_in_use() == 0);
 }
 
-void MEM_use_lockfree_allocator(void)
+void MEM_use_lockfree_allocator()
 {
   /* NOTE: Keep in sync with static initialization of the variables. */
 
@@ -150,7 +150,7 @@ void MEM_use_lockfree_allocator(void)
 #endif
 }
 
-void MEM_use_guarded_allocator(void)
+void MEM_use_guarded_allocator()
 {
   assert_for_allocator_change();
 

diff --git a/intern/rigidbody/RBI_api.h b/intern/rigidbody/RBI_api.h
@@ -261,7 +261,7 @@ void RB_dworld_add_constraint(rbDynamicsWorld *world, rbConstraint *con, int dis
 /* Remove Rigid Body Constraint from simulation world */
 void RB_dworld_remove_constraint(rbDynamicsWorld *world, rbConstraint *con);
 
-rbConstraint *RB_constraint_new_point(float pivot[3], rbRigidBody *rb1, rbRigidBody *rb2);
+rbConstraint *RB_constraint_new_point(const float pivot[3], rbRigidBody *rb1, rbRigidBody *rb2);
 rbConstraint *RB_constraint_new_fixed(float pivot[3],
                                       float orn[4],
                                       rbRigidBody *rb1,

diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
@@ -940,8 +940,8 @@ static void make_constraint_transforms(btTransform &transform1,
                                        btTransform &transform2,
                                        btRigidBody *body1,
                                        btRigidBody *body2,
-                                       float pivot[3],
-                                       float orn[4])
+                                       const float pivot[3],
+                                       const float orn[4])
 {
   btTransform pivot_transform = btTransform();
   pivot_transform.setIdentity();
@@ -952,7 +952,7 @@ static void make_constraint_transforms(btTransform &transform1,
   transform2 = body2->getWorldTransform().inverse() * pivot_transform;
 }
 
-rbConstraint *RB_constraint_new_point(float pivot[3], rbRigidBody *rb1, rbRigidBody *rb2)
+rbConstraint *RB_constraint_new_point(const float pivot[3], rbRigidBody *rb1, rbRigidBody *rb2)
 {
   btRigidBody *body1 = rb1->body;
   btRigidBody *body2 = rb2->body;

diff --git a/locale/po/ab.po b/locale/po/ab.po
@@ -1,7 +1,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Blender 4.2.0 Alpha (b'c30667711948')\n"
+"Project-Id-Version: Blender 4.2.0 Alpha (b'7b7e9f224c89')\n"
 "Report-Msgid-Bugs-To: \n"
 "\"POT-Creation-Date: 2019-02-25 20:41:30\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/locale/po/ar.po b/locale/po/ar.po
@@ -1,9 +1,9 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Blender 4.2.0 Alpha (b'c30667711948')\n"
+"Project-Id-Version: Blender 4.2.0 Alpha (b'7b7e9f224c89')\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-15 10:09+0000\n"
+"POT-Creation-Date: 2024-04-22 07:36+0000\n"
 "PO-Revision-Date: 2016-04-23 22:41+0300\n"
 "Last-Translator: Yousef Harfoush <bat3a@msn.com>\n"
 "Language-Team: Yousef Harfoush, Amine Moussaoui <bat3a@msn.com>\n"
@@ -423,34 +423,18 @@ msgid "After Current"
 msgstr "ﻲﻟﺎﺤﻟﺍ ﺪﻌﺑ"
 
 
-msgid "Number of frames to show after the current frame (only for 'Around Current Frame' Onion-skinning method)"
-msgstr "(ﺔﻴﻓﺎﻔﺸﻟﺍ ﻞﻴﻌﻔﺗ ﺔﻘﻳﺮﻃ 'ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻹﺍ ﻝﻮﺣ' ﻞﺟﺃ ﻦﻣ ﻂﻘﻓ) ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻹﺍ ﺪﻌﺑ ﺓﺮﻫﺎﻈﻟﺍ ﺕﺍﺭﺎﻃﻹﺍ ﺩﺪﻋ"
-
-
 msgid "Before Current"
 msgstr "ﻲﻟﺎﺤﻟﺍ ﻞﺒﻗ"
 
 
-msgid "Number of frames to show before the current frame (only for 'Around Current Frame' Onion-skinning method)"
-msgstr "(ﺔﻴﻓﺎﻔﺸﻟﺍ ﻞﻴﻌﻔﺗ ﺔﻘﻳﺮﻃ 'ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻹﺍ ﻝﻮﺣ' ﻞﺟﻷ ﻂﻘﻓ) ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻹﺍ ﻞﺒﻗ ﺓﺮﻫﺎﻈﻟﺍ ﺮﻃﻷﺍ ﺩﺪﻋ"
-
-
 msgid "End Frame"
 msgstr "ﺔﻳﺎﻬﻨﻟﺍ ﺭﺎﻃﺇ"
 
 
-msgid "End frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method)"
-msgstr "(ﺔﻴﻓﺎﻔﺸﻟﺍ ﻞﻴﻌﻔﺗ ﺔﻘﻳﺮﻃ 'ﻲﻠﺤﻟﺍ ﺭﺎﻃﻹﺍ ﻝﻮﺣ' ﻞﺟﺃ ﻦﻣ ﺲﻴﻟ) ﺏﺎﺴﺤﻟﺍ/ﺭﺎﻬﻇﻺﻟ ﺕﺍﺭﺎﺴﻤﻟﺍ ﻕﺎﻄﻧ ﻞﺟﺃ ﻦﻣ ﺔﻳﺎﻬﻨﻟﺍ ﺭﺎﻃﺇ"
-
-
 msgid "Start Frame"
 msgstr "ﺔﻳﺍﺪﺒﻟﺍ ﺭﺎﻃﺇ"
 
 
-msgid "Starting frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method)"
-msgstr "(ﺔﻴﻓﺎﻔﺸﻟﺍ ﻞﻴﻌﻔﺗ ﺔﻘﻳﺮﻃ 'ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻺﻟﺍ ﻝﻮﺣ' ﻞﺟﺃ ﻦﻣ ﺲﻴﻟ) ﺏﺎﺴﺤﻟﺍ/ﺭﺎﻬﻇﻺﻟ ﺕﺍﺭﺎﺴﻤﻟﺍ ﻕﺎﻄﻧ ﻞﺟﺃ ﻦﻣ ﺔﻳﺍﺪﺒﻟﺍ ﺭﺎﻃﺇ"
-
-
 msgid "Frame Step"
 msgstr "ﺭﺎﻃﻹﺍ ﻡﺪﻘﺗ"
 
@@ -2331,10 +2315,6 @@ msgid "Toe-in"
 msgstr "ﻞﺧﺍﺪّﻟ ﻢﺿ"
 
 
-msgid "Rotated cameras, looking at the convergence distance"
-msgstr "ءﺎﻘﺘﻟﻻﺍ ﺔﻓﺎﺴﻤﻟ ﻪﺠﺘﺗ ,ﺓﺭﺍﺪﻣ ﺕﺍﺮﻴﻤﻛ"
-
-
 msgid "Interocular Distance"
 msgstr "ﻱﺮﺼﺒﻟﺍ ﻦﻴﺑ ﺪﻌﺒﻟﺍ"
 
@@ -9304,10 +9284,6 @@ msgid "Brush Height"
 msgstr "ﺓﺎﺷﺮﻔﻟﺍ ﻉﺎﻔﺗﺭﺍ"
 
 
-msgid "Affectable height of brush (layer height for layer tool, i.e.)"
-msgstr "(ﻼﺜﻣ ,ﺔﻘﺒﻄﻟﺍ ﺓﺍﺩﻻ ﺔﻘﺒﻄﻟﺍ ﻉﺎﻔﺗﺭﺍ) ﺮﺛّﺄﺘﻠﻟ ﻞﺑﺎﻗ ﺓﺎﺷﺮﻔﻟﺍ ﻉﺎﻔﺗﺭﺍ"
-
-
 msgid "Brush Icon Filepath"
 msgstr "ﺓﺎﺷﺮﻔﻟﺍ ﺔﻧﻮﻘﻳﺍ ﻒﻠﻣ ﺭﺎﺴﻣ"
 
@@ -16303,10 +16279,6 @@ msgid "Falloff"
 msgstr "ﻲﺷﻼﺘﻟﺍ"
 
 
-msgid "Falloff type the feather"
-msgstr "ﻲﺷﻼﺘﻟﺍ ﻉﻮﻧ"
-
-
 msgid "Smooth falloff"
 msgstr "ﻢﻴﻌﻨﺘﻟﺍ ﺶﻣﺎﻫ"
 
@@ -29686,10 +29658,6 @@ msgid "Path Animation"
 msgstr "ﺭﺎﺴﻤﻟﺍ ﺔﻛﺮﺣ"
 
 
-msgid "Spot Shape"
-msgstr "ءﻮﻀﻟﺍ ﺔﻌﻘﺑ ﻞﻜﺷ"
-
-
 msgid "Text Boxes"
 msgstr "ﺔﺑﺎﺘﻜﻟﺍ ﺕﺎﻧﺎﺧ"
 
@@ -33844,10 +33812,6 @@ msgid "Show current frame only"
 msgstr "ﻂﻘﻓ ﻲﻟﺎﺤﻟﺍ ﺭﺎﻃﻻﺍ ﺮﻬﻇﺍ"
 
 
-msgid "Separate Colors"
-msgstr "ﻥﺍﻮﻟﻻﺍ ﻞﺼﻓﺍ"
-
-
 msgid "View Type"
 msgstr "ﺽﺮﻌﻟﺍ ﻉﻮﻧ"
 

diff --git a/locale/po/be.po b/locale/po/be.po
@@ -1,9 +1,9 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Blender 4.2.0 Alpha (b'c30667711948')\n"
+"Project-Id-Version: Blender 4.2.0 Alpha (b'7b7e9f224c89')\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-15 10:09+0000\n"
+"POT-Creation-Date: 2024-04-22 07:36+0000\n"
 "PO-Revision-Date: 2024-02-23 23:56+0000\n"
 "Last-Translator: Aleh <zucchini.enjoyer@protonmail.com>\n"
 "Language-Team: Belarusian <https://translate.blender.org/projects/blender-ui/ui/be/>\n"

diff --git a/locale/po/bg.po b/locale/po/bg.po
@@ -1,9 +1,9 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: Blender 4.2.0 Alpha (b'c30667711948')\n"
+"Project-Id-Version: Blender 4.2.0 Alpha (b'7b7e9f224c89')\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-15 10:09+0000\n"
+"POT-Creation-Date: 2024-04-22 07:36+0000\n"
 "PO-Revision-Date: 2023-09-26 10:37+0000\n"
 "Last-Translator: Gilberto Rodrigues <gilbertorodrigues@outlook.com>\n"
 "Language-Team: Bulgarian <https://translate.blender.org/projects/blender-ui/ui/bg/>\n"