[Bf-blender-cvs] [c632396733a] blender-v2.83-release: Fix T75991: crash when rigidbody encounters unknown constraint type

Campbell Barton noreply at git.blender.org
Thu Apr 23 03:52:30 CEST 2020


Commit: c632396733ab5b9e338cb532501cc84d19cc67c2
Author: Campbell Barton
Date:   Thu Apr 23 11:28:32 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBc632396733ab5b9e338cb532501cc84d19cc67c2

Fix T75991: crash when rigidbody encounters unknown constraint type

This just adds a check to prevent the crash,
Versioning invalid types still needed.

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

M	source/blender/blenkernel/intern/rigidbody.c

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index f08de835a9d..4d37c2ea931 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1027,6 +1027,11 @@ static void rigidbody_validate_sim_constraint(RigidBodyWorld *rbw, Object *ob, b
       return;
     }
 
+    /* When 'rbc->type' is unknown. */
+    if (rbc->physics_constraint == NULL) {
+      return;
+    }
+
     RB_constraint_set_enabled(rbc->physics_constraint, rbc->flag & RBC_FLAG_ENABLED);
 
     if (rbc->flag & RBC_FLAG_USE_BREAKING) {



More information about the Bf-blender-cvs mailing list