diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-28 10:56:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-28 10:56:47 +0400 |
commit | 2e822e30b17d9cdd67fd21b1d1f6a29e5c64c985 (patch) | |
tree | adf8b2f364d024477d83ac8c0ce22c44f98d51df /source/blender/editors/object | |
parent | 6aece07aaf61e7b45120fdee7622d4c870082db8 (diff) |
add collision masks to copy-game-physics settings. (another GGJ missing feature :) )
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 5e5e38c3e43..4807e7364ea 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1864,9 +1864,7 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op)) ob_iter->max_vel = ob->max_vel; ob_iter->obstacleRad = ob->obstacleRad; ob_iter->mass = ob->mass; - ob_iter->anisotropicFriction[0] = ob->anisotropicFriction[0]; - ob_iter->anisotropicFriction[1] = ob->anisotropicFriction[1]; - ob_iter->anisotropicFriction[2] = ob->anisotropicFriction[2]; + copy_v3_v3(ob_iter->anisotropicFriction, ob->anisotropicFriction); ob_iter->collision_boundtype = ob->collision_boundtype; ob_iter->margin = ob->margin; ob_iter->bsoft = copy_bulletsoftbody(ob->bsoft); @@ -1874,6 +1872,9 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op)) ob_iter->restrictflag |= OB_RESTRICT_RENDER; else ob_iter->restrictflag &= ~OB_RESTRICT_RENDER; + + ob_iter->col_group = ob->col_group; + ob_iter->col_mask = ob->col_mask; } } CTX_DATA_END; |