diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-10 20:18:48 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-10 20:18:48 +0400 |
| commit | 4b80e1aba2e6f92b08ceddca2cab7d108ef8fac0 (patch) | |
| tree | 25314bc064fbd9fc4607400fcd8f793be87a8343 /source/blender/makesdna/DNA_object_force.h | |
| parent | 77faef7b5f9d0d1cc80bff88e261ff8028f621cf (diff) | |
| parent | b62a956cc8c9402880d249d0a70c880af5813bc3 (diff) | |
Merge with trunk r38281
Diffstat (limited to 'source/blender/makesdna/DNA_object_force.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 009894faa6a..41ca6ff3042 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -421,7 +421,7 @@ typedef struct SoftBody { #define OB_SB_SELF 512 #define OB_SB_FACECOLL 1024 #define OB_SB_EDGECOLL 2048 -#define OB_SB_COLLFINAL 4096 +#define OB_SB_COLLFINAL 4096 /* deprecated */ #define OB_SB_BIG_UI 8192 #define OB_SB_AERO_ANGLE 16384 |