[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54140] trunk/blender/source/blender/ editors/object/object_edit.c: add collision masks to copy-game-physics settings.

[Campbell Barton]

Revision: 54140
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54140
Author:   campbellbarton
Date:     2013-01-28 06:56:47 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
add collision masks to copy-game-physics settings. (another GGJ missing feature :) )

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2013-01-28 06:44:06 UTC (rev 54139)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2013-01-28 06:56:47 UTC (rev 54140)
@@ -1864,9 +1864,7 @@
 			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 @@
 				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;