svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-09-18 14:59:44 +00:00
parent 190aae27ae 423b053904
commit fc312fae98
407 changed files with 34363 additions and 8460 deletions
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -959,7 +959,8 @@ Object *add_only_object(int type, char *name)
 	ob->anisotropicFriction[0] = 1.0f;
 	ob->anisotropicFriction[1] = 1.0f;
 	ob->anisotropicFriction[2] = 1.0f;
-	ob->gameflag= OB_PROP;
+	ob->gameflag= OB_PROP|OB_COLLISION;
+	ob->margin = 0.0;

 	/* NT fluid sim defaults */
 	ob->fluidsimFlag = 0;