diff options
| author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
|---|---|---|
| committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
| commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
| tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/makesrna/intern/rna_rigidbody.c | |
| parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
| parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) | |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/makesrna/intern/rna_rigidbody.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_rigidbody.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 9c3b1fe3063..aa90ba28e23 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -261,7 +261,7 @@ static void rna_RigidBodyOb_collision_margin_set(PointerRNA *ptr, float value) #endif } -static void rna_RigidBodyOb_collision_groups_set(PointerRNA *ptr, const int *values) +static void rna_RigidBodyOb_collision_groups_set(PointerRNA *ptr, const bool *values) { RigidBodyOb *rbo = (RigidBodyOb *)ptr->data; int i; |