Cleanup: Get rid of unused BKE_rigidbody_relink_constraint().
Also use proper ID_NEW_REMAP macro in BKE_rigidbody_world_groups_relink()!
This commit is contained in:
parent
b708dce34f
commit
62703850ad
|
@ -51,7 +51,6 @@ void BKE_rigidbody_free_constraint(struct Object *ob);
|
|||
|
||||
struct RigidBodyOb *BKE_rigidbody_copy_object(struct Object *ob);
|
||||
struct RigidBodyCon *BKE_rigidbody_copy_constraint(struct Object *ob);
|
||||
void BKE_rigidbody_relink_constraint(struct RigidBodyCon *rbc);
|
||||
|
||||
/* Callback format for performing operations on ID-pointers for rigidbody world. */
|
||||
typedef void (*RigidbodyWorldIDFunc)(struct RigidBodyWorld *rbw, struct ID **idpoin, void *userdata, int cd_flag);
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
# include "RBI_api.h"
|
||||
#endif
|
||||
|
||||
#include "DNA_ID.h"
|
||||
#include "DNA_group_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
#include "DNA_object_types.h"
|
||||
|
@ -222,13 +223,6 @@ RigidBodyCon *BKE_rigidbody_copy_constraint(Object *ob)
|
|||
return rbcN;
|
||||
}
|
||||
|
||||
/* preserve relationships between constraints and rigid bodies after duplication */
|
||||
void BKE_rigidbody_relink_constraint(RigidBodyCon *rbc)
|
||||
{
|
||||
ID_NEW_REMAP(rbc->ob1);
|
||||
ID_NEW_REMAP(rbc->ob2);
|
||||
}
|
||||
|
||||
/* ************************************** */
|
||||
/* Setup Utilities - Validate Sim Instances */
|
||||
|
||||
|
@ -973,12 +967,9 @@ RigidBodyWorld *BKE_rigidbody_world_copy(RigidBodyWorld *rbw)
|
|||
|
||||
void BKE_rigidbody_world_groups_relink(RigidBodyWorld *rbw)
|
||||
{
|
||||
if (rbw->group && rbw->group->id.newid)
|
||||
rbw->group = (Group *)rbw->group->id.newid;
|
||||
if (rbw->constraints && rbw->constraints->id.newid)
|
||||
rbw->constraints = (Group *)rbw->constraints->id.newid;
|
||||
if (rbw->effector_weights->group && rbw->effector_weights->group->id.newid)
|
||||
rbw->effector_weights->group = (Group *)rbw->effector_weights->group->id.newid;
|
||||
ID_NEW_REMAP(rbw->group);
|
||||
ID_NEW_REMAP(rbw->constraints);
|
||||
ID_NEW_REMAP(rbw->effector_weights->group);
|
||||
}
|
||||
|
||||
void BKE_rigidbody_world_id_loop(RigidBodyWorld *rbw, RigidbodyWorldIDFunc func, void *userdata)
|
||||
|
|
Loading…
Reference in New Issue