diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-18 18:59:44 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-18 18:59:44 +0400 |
| commit | fc312fae98f54b56d00812fee64aa9e9e1ee74ff (patch) | |
| tree | bdb691f07cacd5c18bf318e024469400551d8476 /source/blender/blenkernel/intern/object.c | |
| parent | 190aae27ae7149945f2bf802d7cfd7691f61c45f (diff) | |
| parent | 423b05390434c310c0f0e59ef62fce79287c581b (diff) | |
svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index e6b7f18f6bb..79be7dbf460 100644 --- 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; |