Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / object / object_add.c
index 7e85ab1e9919b20598b565fb5b87c1c65a928381..0ceb177164ad155c77eaeac353a874d522320b7f 100644 (file)
@@ -1600,7 +1600,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 
                        if (newob->type == OB_CURVE) {
                                BKE_object_free_modifiers(newob);   /* after derivedmesh calls! */
-                               ED_rigidbody_object_remove(scene, newob);
+                               ED_rigidbody_object_remove(bmain, scene, newob);
                        }
                }
                else if (ob->type == OB_MESH && ob->modifiers.first) { /* converting a mesh with no modifiers causes a segfault */