griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-02-21 23:52:30 +01:00
parent 92aab7c3db 01a151c89d
commit 9fa4112748
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/blenkernel/intern/rigidbody.cc
View File

@@ -70,22 +70,6 @@ struct rbRigidBody;
/* Freeing Methods --------------------- */
struct RigidBodyWorld_Runtime {
#ifdef WITH_BULLET
rbDynamicsWorld *physics_world = nullptr;
#endif
std::mutex mutex;
~RigidBodyWorld_Runtime()
{
#ifdef WITH_BULLET
if (physics_world) {
RB_dworld_delete(physics_world);
}
#endif
}
};
#ifdef WITH_BULLET
static void rigidbody_update_ob_array(RigidBodyWorld *rbw);
#else
@@ -95,9 +79,20 @@ static void RB_dworld_delete(void * /*world*/) {}
static void RB_body_delete(void * /*body*/) {}
static void RB_shape_delete(void * /*shape*/) {}
static void RB_constraint_delete(void * /*con*/) {}
#endif
struct RigidBodyWorld_Runtime {
rbDynamicsWorld *physics_world = nullptr;
std::mutex mutex;
~RigidBodyWorld_Runtime()
{
if (physics_world) {
RB_dworld_delete(physics_world);
}
}
};
void BKE_rigidbody_world_init_runtime(RigidBodyWorld *rbw)
{
if (rbw->shared) {