projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
BGE patch: new Physics button and margin parameter in Logic panel. Change subversion.
[blender-staging.git]
/
source
/
blender
/
blenkernel
/
intern
/
object.c
diff --git
a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 3ed169ff77daf04df2446cbab7ec84363d85e64a..e63d6047cc63d55afa005b089227a7ce2d5aefe1 100644
(file)
--- a/
source/blender/blenkernel/intern/object.c
+++ b/
source/blender/blenkernel/intern/object.c
@@
-960,7
+960,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_PHYSICS;
+ ob->margin = 0.0;
/* NT fluid sim defaults */
ob->fluidsimFlag = 0;