diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-20 13:06:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-20 13:06:26 +0300 |
| commit | c9c207f093b91c2d72cc053284171108a2cb8aee (patch) | |
| tree | 775c55f5fd07bdb1ccf1b2665d9dbde0fde91b17 /source/blender/makesdna/DNA_object_types.h | |
| parent | a2d5380f621e963dd7d7a99bbf7d3c5231571f8d (diff) | |
| parent | 9b4c8a25076fcba566997137140fd23166d52654 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3781bf0b5a4..feb1f772a79 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -580,7 +580,7 @@ enum { #define OB_MAX_STATES 30 /* collision masks */ -#define OB_MAX_COL_MASKS 8 +#define OB_MAX_COL_MASKS 16 /* ob->gameflag */ enum { |