diff options
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index bfb13fb99bf..482ae4019c3 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2572,7 +2572,9 @@ static int object_convert_exec(bContext *C, wmOperator *op) if (newob->type == OB_CURVE) { BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */ - ED_rigidbody_object_remove(bmain, scene, newob); + if (newob->rigidbody_object != NULL) { + ED_rigidbody_object_remove(bmain, scene, newob); + } } } else if (ob->type == OB_MESH && target == OB_GPENCIL) { |